minor edits
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
updated all the errors
Merge pull request #10 from CTFigueroa/master

Updated all errors
charles first commit
updated errors
Merge branch 'master' of github.com:tiy-chs-q4-fee/lamp
Merge pull request #11 from CTFigueroa/master

Updated errors
added logo
merged and added sweet stuff
added stock recipes
Merge pull request #12 from lapty/master

whatever
fixed merge conflict on services page
Merge pull request #14 from margaretgodowns/master

fixed services merge conflict
updated posts array in services.js
Merge pull request #15 from CTFigueroa/master

updated posts array in services.js