pull
Merge branch 'master' of https://github.com/ClubEngine/GameJam7

Conflicts:
	js/main.js