Rename card to cart
Merge branch 'master' into shop_cart
shopping cart modifications
shopping cart changes
shopping cart changes
shopping cart changes
shopping cart changes
shopping cart changes
shopping cart changes
Merge pull request #29 from Empters/front

Front end for home page updated according the new desing
Merge branch 'master' into shop_cart

Conflicts:
	app/views/products/_product.html.erb
	app/views/shopping_cards/index.html.erb
Merge with master. Add category seed data. Add export rake - export DB to seed file
Merge pull request #28 from Empters/shop_cart

Shop cart
new design changes
db seed changes
Merge pull request #30 from Empters/shop_cart

Shop cart
Page design minimized