little change
little change
Merge branch 'gh-pages' of https://github.com/singlewindy/BIT-CHINA into gh-pages

Conflicts:
	css/segmentation.min.css