Player class and movement
Merge branch 'Jonathan'