beat maker
fixed commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	SteveGuitarHero/Music/song1.txt
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git

Conflicts:
	SteveGuitarHero/Music/song1.txt
Merge remote-tracking branch 'origin/master'