new commit
new commit
new commit 2
Merge origin/master

Conflicts:
	src/guitarhero/GuitarHero.java