merge fixes
Merge branch 'master' of github.com:oc-cs170/feed-me