added controller to grocery list
grocery controll
fixed merge conflict
Merge pull request #8 from lizkline91/master

edit controller for grocery