Merge pull request #1 from tyler-weeres/player

Player
Merge remote-tracking branch 'origin/master' into player