Move fake data into controller
Add a before clause
Merge branch 'master' into move-fake-data-to-controller
Merge branch 'move-fake-data-to-controller'
Merge branch 'master' of https://github.com/spree-girls/spree-theme-market
ommit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Conflicts:
	app/views/items/index.html.erb