Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Merge pull request #1 from ucooling/gh-pages

hh