Merge pull request #2 from xieyi64/master

Merge pull request #1 from xieyi64/gh-pages
Replace master branch with page content via GitHub

Conflicts:
	index.html