fixed timer, started powerup
Merge branch 'develop' of https://github.com/klinginE/project2.git into
develop

Conflicts:
	src/project2/SinglePlayerGameState.java
more powerup stuff