Initial commit
modify: submit the file
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/index.ejs
modify: submit the file
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	public/css/style.less
	test/index.html
	views/index.ejs
modify:menu style & business