changes to player and entity
Merge pull request #2 from SiriusA/master

changes to player and entity