Merge branch 'master' of https://github.com/spree-girls/spree-theme-market into new_form_model
Move file columns from items to attachments table
Add better_errors gem
Add attachment model
Add reform gem to make form model
Merge branch 'master' of https://github.com/spree-girls/spree-theme-market into new_form_model

Conflicts:
	Gemfile.lock
Add AWS gem
Update gem file.;lock
Add paperclip config details
Add FFI gem for Travis CI
Gemfile lock update
Merge branch 'master' of github.com:spree-girls/spree-theme-market into new_form_model

Conflicts:
	Gemfile
	Gemfile.lock
Clean up ItemForm
Merge pull request #34 from spree-girls/new_form_model

New form model