dd
Merge branch 'master' of https://github.com/rococori/we-connect

Conflicts:
	lab/AlexJinMo_Test/views/signUpPgs/signupStudent.ejs
Merge branch 'master' of https://github.com/rococori/we-connect