Merge branch 'master' of github.com:Ceddy/bushizhang

Conflicts:
	public/css/main.css
Merge branch 'master' of github.com:Ceddy/bushizhang

Conflicts:
	public/css/main.css