merging
Merge branch 'master' of github.com:wearecharette/hyppo

auto merging changes