Added basic player stuff - affected by gravity, has a sprite. Testing
purposes only.
Resolved conflict