create item model/controller
fix merge conflict in Gemfile
add skeleton for items_controller and item views
add feature folder in spec folder
add travis.yml file
fix travis.yml
require rails helper in spec helper, add capybara/rspec require, modify require in model tests
require rails helper in spec helper, add capybara/rspec require, modify require in model tests
Merge branch 'luke' of github.com:ianderse/dinner_dash into luke
Merge pull request #17 from ianderse/luke

require rails helper in spec helper, add capybara/rspec require, modify ...
fixed merge conflicts