init
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/config/routes.js
	server/controllers/productsController.js
Merge branch 'master' of https://github.com/2She2/Team-Iris-NodeJS

Conflicts:
	server/controllers/productsController.js