lots of changes
Merge pull request #13 from brandhatchery/dev

lots of changes