Nothing much
Merge
Merge branch 'master' of https://github.com/olavvatne/Foodie
small refactoring changes
merge