stupid tabs
Merge https://github.com/nsipid/ludum26

Conflicts:
	js/game.js