Day 9 Shopping Cart Part 2
Day 10 - User registration and login
Day 11 $cookieStore
Merge remote-tracking branch 'origin/master' into completed

Conflicts:
	models/User.js
	node_modules/express-session/node_modules/buffer-crc32/package.json
	node_modules/express-session/node_modules/cookie-signature/package.json
	node_modules/express-session/node_modules/cookie/package.json
	node_modules/express-session/node_modules/on-headers/package.json
	node_modules/express-session/node_modules/uid2/package.json
	node_modules/express-session/node_modules/utils-merge/package.json
	node_modules/express-session/package.json
	node_modules/passport-local/node_modules/passport-strategy/package.json
	node_modules/passport-local/package.json
	node_modules/passport/node_modules/passport-strategy/package.json
	node_modules/passport/node_modules/pause/package.json
	package.json
	public/controllers/app-controller.js
	public/controllers/cart-controller.js
	public/controllers/login-controller.js
	public/controllers/signup-controller.js
	public/directives/add-cart-button.js
	public/index.html
	public/routes.js
	public/services/auth-service.js
	public/services/cart-service.js
	public/templates/mini-cart.html
	public/views/cart.html
	public/views/login.html
	public/views/product-detail.html
	public/views/product-list.html
	public/views/signup.html
	routes.js
	server.js