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

Conflicts:
	app/router.js
	app/routes/login.js
	app/views/index.ejs
	app/views/signUpPgs/signupFaculty.ejs
	app/views/signUpPgs/signupStudent.ejs
Register
Merge branch 'master' of https://github.com/rococori/we-connect