Removed some leftover diffs, sorreh
Merge branch 'master' of https://github.com/hermith/mclak_healthy_catering_project