Added positional and directional data to Entity
Player can be drawn
Game can end
Merge remote-tracking branch 'origin/master' into sam

Conflicts resolved:
	Stomp/src/stomp/Stomp.java
Collision detection on Platforms implemented
Player movement implemented
Basic character controls implemented

Still buggy though.