beat finalized
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git
added return statement to getKeyPressed method.
Merge branch 'master' of https://github.com/mattplatoff/Guitarhero.git

Conflicts:
	GuitarHero/src/processinggame/Guitar.java