returned to local dev, implemented changes
Merge branch 'master' of https://github.com/agconti/Hunch