fix conflicts
Merge branch 'save' of https://github.com/makerslocal/LudumDare30 into save

Conflicts:
	game.html