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

Conflicts:
	app/router.js
	app/views/announcement/detail.ejs

resolved
apply done