flip flip
Merge branch 'master' of https://github.com/aproctor/thrillho

Conflicts:
	Assets/Scenes/game.unity
Merge branch 'master' of https://github.com/aproctor/thrillho
layers for feet, body, object, bullet, platform
hop downs
Merge branch 'master' of https://github.com/aproctor/thrillho