Merge branch 'master' of https://github.com/senghuot/Rouxmeet

Conflicts:
	views/index.ejs
Merge branch 'master' of https://github.com/senghuot/Rouxmeet

Conflicts:
	views/index.ejs