fixing
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git

Conflicts:
	GuitarHero/src/maingame/Gui.java