Generated Administrator model
Ran migration for administrator model
Created item model
Added Buyer model
Added Purchased Items model
Fixed typo
Merge pull request #3 from spree-girls/create-admin-model

Create admin model
Added Rspec and Capybara
Merge branch 'master' of https://github.com/spree-girls/spree-theme-market
Merge pull request #5 from spree-girls/add-item-model

Created item model
Merge pull request #6 from spree-girls/add-buyer-model

Added Buyer model
Added Factory Girl Rails
Merge branch 'master' of https://github.com/spree-girls/spree-theme-market
Merge pull request #8 from spree-girls/add-purchased-item-model

Added Purchased Items model
Merge branch 'master' of https://github.com/spree-girls/spree-theme-market
Gemfile Lock changed
Merge branch 'master' of https://github.com/spree-girls/spree-theme-market into add-attachment-model

Conflicts:
	db/schema.rb