done shop cart
check login user for add cart button
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/view_shop.php