Updated templates
Updated WhatToEat template
Fixed merge conflicts