register page modified
index page with pop up login
commit
files commited
this
updated
sidelist taken care of
Merge remote-tracking branch 'origin/forDesigners' into forDesigners

Conflicts:
	#.gitignore
	#application/modules/category/controllers/category.php
	#application/modules/category/models/category_model.php
	#application/modules/category/views/categorylist.php
	#application/modules/product/controllers/product.php
	#application/modules/product/models/product_model.php
	#application/modules/product/views/addproduct.php
	#application/modules/product/views/editproduct.php
	#application/modules/product/views/viewProduct.php
	#application/modules/user/controllers/user.php
	#application/modules/user/views/login.php
	#db_shoppingcart.sql
css file taken care of