added stylesheets and logo
create item model/controller
fix merge conflict in Gemfile
require rails helper in spec helper, add capybara/rspec require, modify require in model tests