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

f
test
Revert "2"

This reverts commit 4bc6a43361d530b58a05478653157f4651ce9ff9.

Conflicts:
	server.js
test