Merge branch 'master' of github.com:Sakarisson/GGJ-2018
