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

Conflicts:
	app/views/account/register.ejs