fixed merge conflicts
Merge branch 'master' of github.com:phildinuzzo/goodfood