Added seed data
Merge branch 'items-seed' into cart

Conflicts:
	app/views/layouts/application.html.haml