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

Conflicts:
	index.html
merge master's css, js
Merge branch 'gh-pages'