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

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

Conflicts:
	public/css/style.less
	test/css/test.css
	test/index.html
	test/js/index.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	public/css/style.less
	test/index.html
	views/index.ejs
modify:menu style & business
modify:menu style & business
Merge branch 'master' of https://github.com/Luoxinfang/somgle

Conflicts:
	app.js
	public/css/index.css
	public/inc/register.html
	public/js/page/com.js
	public/js/page/index.js
	public/js/radish/build/config.js
	routes/index.js
	test/index.html
	views/inc/footer.ejs
	views/inc/header.html
	views/index.ejs