task F complete
Merge branch 'master' of https://github.com/p63/Depot-Scaffold

Conflicts:
	app/views/carts/_cart.html.erb