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

edit controller for grocery
Merge branch 'master' of github.com:tiy-chs-q4-fee/lamp