add
delete
Merge branch 'gh-pages' of https://github.com/jetzhliu/test into gh-pages

Conflicts:
	index.html