Merge branch 'master' of https://github.com/kenchou0731/MIS_project

Conflicts:
	config/routes.js
doing panel
Merge branch 'master' of https://github.com/kenchou0731/MIS_project

Conflicts:
	config/routes.js
	views/feed/all.ejs
Merge branch 'master' of https://github.com/kenchou0731/MIS_project

Conflicts:
	views/header.ejs
layout(src:datatables.min.js)
Merge branch 'master' of https://github.com/kenchou0731/MIS_project
layout.ejs(src=datatables.min.js);knowledge.ejs(example)