lol
Merge branch 'master' of https://github.com/makerslocal/LudumDare30

Conflicts:
	game.html