Stashing
No real changes, told to push to master
Merge pull request #38 from floorman/master

No real changes, told to push