Basic player movement
Merge remote-tracking branch 'origin/Player'
merging player master
movement