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

Conflicts:
	development/src/GameJamGameState.as
	development/src/Main.as
classpath
Deleted Parallax Background
Merge branch 'master' of https://github.com/joepenzo/thenoshitsherlocks

Conflicts:
	development/src/GameJamGameState.as
Background
merge