added to the form page
Merge pull request #2 from natalie03/master

added to the form page
added grocery
Merge pull request #3 from lizkline91/master

added grocery
added ui bootstrap
edit...
resolved conflicts
Merge pull request #5 from wgallop99/master

Added angular services
Merge pull request #4 from margaretgodowns/master

added ui bootstrap and homeCtrl
added controller to grocery list
added accordian
Merge pull request #6 from margaretgodowns/master

added accordian
grocery controll
minor edits
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
Merge pull request #9 from margaretgodowns/master

what up
udpates
updated merge conflicts