Merge branch 'develop' into feature
Merge branch 'feature' into develop
added accel bonus
Merge branch 'develop' of https://github.com/klinginE/project2.git into
develop

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

Conflicts:
	src/project2/Cart.java
	src/project2/Level.java
	src/project2/SinglePlayerGameState.java