food, meal and calander mock finished
fixed merge conflict i tink