Edited player
Fixed merge conflict
Merge branch 'master' of https://github.com/TeamRocketFall/Game