Merge pull request #5 from michael21115/player

Player