Styling tweaks
Merge branch 'master' of github.com:TeamAlberto/AlbertoApp

Conflicts:
	app/scripts/templates/cart-item.ejs