Merged Changes GUI
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git

Conflicts:
	GuitarHero/src/processinggame/Gui.java
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git
fix commit