Add Cart
Merge branch 'master' of github.com:GustavoCaso/Maximiliano

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