Better player character
Merge branch 'chrisDev'