Workin on stuff
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29

Conflicts:
	src/js/level/player.js