New Version
Merge branch 'master' of https://github.com/joepenzo/thenoshitsherlocks

Conflicts:
	development/bin/Main.swf
	development/src/GameJamGameState.as
	development/src/components/hill/HillsView.as