obstacles, jump, cliffs
Merge branch 'master' of https://github.com/joepenzo/thenoshitsherlocks

Conflicts:
	development/src/GameJamGameState.as
	development/src/components/hill/HillManager.as