Merge branch 'master' of
https://github.com/tjmitchell1/mean-stack-capstone.git

Conflicts:
	server.js
Merge branch 'master' of https://github.com/tjmitchell1/mean-stack-capstone