Merge origin/master

Conflicts:
	src/guitarhero/GuitarHero.java