Testing some basic gravity
Player can calculate its state
Merge branch 'dev'
Merged dev into master