Refactor player class
Merge branch 'master' of github.com:Javafant/mindless-slayer