Merge branch 'user' of https://github.com/lln7777/zhuyun into regui
Merge branch 'user' of https://github.com/lln7777/zhuyun into regui
 Merge branch 'jack' of https://github.com/lln7777/zhuyun into regui

Conflicts:
	public/stylesheets/index.css
	views/index.ejs
 Merge branch 'user' of https://github.com/lln7777/zhuyun into regui

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	public/javascripts/index.js
	public/stylesheets/index.css
	views/index.ejs
	views/main.ejs