update
update
Merge branch 'gh-pages' of
https://zhenglianfu:jbwang008@github.com/zhenglianfu/foo.git into
gh-pages

Conflicts:
	static/js/index.js