fix bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/auchis.ejs
edit pages
Merge branch 'master' of https://github.com/FeiyuYin/cmpe273_project