서버 수정
Merge branch 'master' of https://github.com/Nexters/WeStudy

Conflicts:
	server/controllers/userCtrl.js