m
Merge branch 'master' of github.com:lizzyphy/lab_baozha

Conflicts:
	static/css/css.css
	static/img/tb.jpg