fixed spamming error
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git

Conflicts:
	SteveGuitarHero/src/maingame/Gui.java
	SteveGuitarHero/src/maingame/ScoreKeeper.java