totally refactored entity
merge player
Merge branch 'master' of https://github.com/euclio/roguelike