test

1
Merge branch 'gh-pages' of https://github.com/huangxining/xining into gh-pages

Conflicts:
	README.md