Merge branch 'develop' into feature
Merge branch 'feature' into develop
added accel bonus
fixed issue with poerups not disapearing upon pickup.
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
fixed progress bar and battery boost and speed related things
got it to wait for every player to cross the finish line before results
come up.
more cart adjustments
more fixes
Got progress bar on server to work
made same changes to serialized update
Got basic weapon functionality on the server.
Merge branch 'develop' of git@github.com:klinginE/project2.git into
develop

Conflicts:
	src/project2/BlackFridayBlitz.java
	src/project2/MultiPlayerGameState.java
	src/project2/SinglePlayerGameState.java
got rid of other powerups and left battery. Runs OK with 4 players. Two
is better.