Added height & size of the player. Git merge test.
Merge remote-tracking branch 'origin/master'
Changed a field in the map