Added some sweet-ass getters to the Entity class.
We have User Input now!
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamejam/src/Engine/GameModel.java