pre-pull commit. basic collision scanline and loop set up for player 1.
Pushing for Corey.
Merge branch 'collision' into Develop

Conflicts:
	src/pistolcave/PlayingState.java