Merge branch 'gh-pages' of https://github.com/bineanzhou/caipiao.360.cn into gh-pages

Conflicts:
	pages/js_test.html

Signed-off-by: bineanzhou <bineanzhou@163.com>
Merge branch 'gh-pages' of https://github.com/bineanzhou/caipiao.360.cn into gh-pages

Conflicts:
	pages/js_test.html

Signed-off-by: bineanzhou <bineanzhou@163.com>