change
Merge branch 'gh-pages' of https://github.com/ShuhaoCoLtd/ARBookShelf into gh-pages

Conflicts:
	sxh_Test.txt