adding to cart working
Merge branch 'cart-functionality'

Conflicts:
	app/views/pages/index.blade.php