updates
Merge branch 'master' of https://github.com/poplicola/glitch_game

Conflicts:
	main.buildv78h/html5/main.js