learning how t do pull requests
Merge pull request #110 from mareofnight/develop

learning how to do pull requests