Design 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	mongoosepm/server/routes/user.js