Update Files
Merge branch 'gh-pages' of github.com:hawkeyechen/start into gh-pages

Conflicts:
	index.html

	modified:   index.html