WIP - Working on player controls
Merge remote-tracking branch 'origin/master' into player
Merge remote-tracking branch 'origin/master' into player
Got the basic player controls working
More parts of the last commit.

Don't know why these didn't get included....strange
Merge remote-tracking branch 'origin/player'