Player controls mostly working, though not elegant.
Merge remote-tracking branch 'origin/master'
Updated player prefab and scene.