update
update
Merge branch 'gh-pages' of https://github.com/hjinshan/jsfun into gh-pages

Conflicts:
	css/common.css
	sass/common.scss