moved a few things, no real changes
Merge branch 'develop' of https://github.com/swelshh/Wakalorie into feature/genfoods