Getter and Setter added
Getter Setters added
Merge branch 'master' of https://github.com/mbelsare/CMPE202

Conflicts:
	Project/GameWorld.java
	Project/Project/.DS_Store
	Project/Project/GamePlay.ctxt
	Project/Project/images/Boy.png
	Project/project.greenfoot