User file
Entity and Player
Merge branch 'master' of https://github.com/mmbob/Game.git