Pagination added
Pagination added
merge of changes
Merge branch 'master' of https://github.com/gvarun22/E-MART

Conflicts:
	build/web/WEB-INF/content/Cart.jsp
	build/web/css/global.css
	nbproject/build-impl.xml
	nbproject/build-impl.xml~
	nbproject/project.properties
	nbproject/project.xml
	web/WEB-INF/content/Cart.jsp
	web/WEB-INF/content/Item.jsp
Pagination added