ADDING new files
 server.js changes
changes in product.jade
Merge https://github.com/LoveleenS/e-shop

Conflicts:
	public/css/bootstrap.css
	public/css/site.css
	public/css/site.styl
	public/img/uploadeddd.jpg
	public/js/DataService.js
	server.js
	server/views/index.jade
	server/views/partials/cart.jade
	server/views/partials/product.jade
	server/views/partials/store.jade
Merge https://github.com/LoveleenS/e-shop

Conflicts:
	public/img/uploadeddd.jpg