move style from base to main. Qiu
Merge branch 'master' of github.com:twers/re-education into rewrite_responsive_style
rewrite responsive style for about-us page. Qiu
use sass to load web font. Qiu
Merge branch 'rewrite_responsive_style' of github.com:twers/re-education

Conflicts:
	app/assets/stylesheets/about-us.css.scss