It fallsssss
Merge branch 'master' of https://github.com/BrigadierBaobab/HoboStrathHack

Conflicts:
	index.html
	static/js/ground.js
	static/js/player.js