미완성
Merge branch 'master' of https://github.com/MiyeonJ/WorkingBoard

Conflicts:
	app/routes.js
	views/calendar.ejs
	views/index.ejs
	views/main.ejs