merged character and player
Merge pull request #9 from jacketattack/character-fix

Character fix