Day 6
adadaadadadadadaMerge branch 'master' of https://github.com/Mg1460/geekwise

Conflicts:
	assets/css/layout.css
	controllers/product-detail-controller.js
	index.html
	views/home.html
	views/product-detail.html
	views/product-list.html