Merge pull request #1 from nielsvandenboogaart/master

General cleanup
Added width, height and scale variables to Player object