oho boom
pics
Merge branch 'refs/heads/menu'

Conflicts:
	game/game.js
	index.html
menu in extra script file
Merge branch 'master' of https://github.com/Slin/glow