nic
Merge branch 'master' of https://github.com/Qaterknan/LudumDare29

Conflicts:
	js/levels/game.js