Merging Zachs collision work.
Merge branch 'Develop' of
ssh://git@github.com/D3LTR0N-Z3R0/GameProject.git into Develop

Conflicts:
	src/pistolcave/PistolCaveGame.java
	src/pistolcave/PlayingState.java