merging
Merge branch 'master' of https://github.com/sotoseattle/UrbanHoe
Tests kind of passing
Merge pull request #21 from fparker9676/master

Tests passing