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

Conflicts:
	SteveGuitarHero/src/maingame/MusicPlayer.java