Added comment for getX in entity.
Merge branch 'master' of https://github.com/tomfischerr/Prosper.git

Conflicts:
	src/Entity.java