bug记录
Merge branch 'master' of https://github.com/mumuka/wubuqun

Conflicts:
	bug.txt
	css/wubu.css.map