Work in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	SteveGuitarHero/src/maingame/Gui.java
	SteveGuitarHero/src/maingame/MusicPlayer.java
test comment
l
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git