Added player class
Resolved conflict
Merge branch 'master' of https://github.com/ajclarke/shafted