grocery_items controller, view, and tests
fix merge conflict in schema.rb
add new files
Merge branch 'master' of https://github.com/purple-martins-2013/live-together into grocery_items
delete commented line
remove improper context line
Merge pull request #19 from purple-martins-2013/grocery_items

Grocery items