Merge branch 'master' of https://github.com/jcxm360/test

Conflicts:
	index.html
Revert "Merge branch 'master' of https://github.com/jcxm360/test"

This reverts commit 7952ac1d10d65a354cb12da7b556118bfef49f12.