Player movement
Merge branch 'chrisDev'
Fixed scene
Merge branch 'chrisDev'
Merge branch 'master' into zacDev