commit
Merge branch 'master' of https://github.com/ErikUggeldahl/GGJ14.git
bug fix
Merge branch 'master' of https://github.com/ErikUggeldahl/GGJ14.git