Merge pull request #37 from Kierz/master

making sure me and dan are uptodate
Stashing
No real changes, told to push to master
Added friction to player class
Merge pull request #38 from floorman/master

No real changes, told to push
stashing