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
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