Merge pull request #2 from floorman/master

Player slides around on ice
Moved stuff
Moved stuff
Deletion of unecessary files