changes v2
Merge branch 'master' of https://github.com/ZaneHendrix/projectGreg

Conflicts:
	ProjectGreg/Game.java
	ProjectGreg/src/com/me/ProjectGreg/Player.java
merge