did a ton of shit
Merge pull request #8 from blaw711/develop

did a ton of shit