commit for pull
Merge branch 'develop' of https://github.com/klinginE/project2.git into develop
merging with origin
Merge branch 'develop' of https://github.com/klinginE/project2.git into
develop

Conflicts:
	src/project2/SinglePlayerGameState.java
Merge branch 'develop' of https://github.com/klinginE/project2.git into
develop

Conflicts:
	src/project2/BlackFridayBlitz.java
	src/project2/Cart.java
	src/project2/GameState.java
	src/project2/Player.java
	src/project2/SinglePlayerGameState.java