Merge branch 'master' of https://github.com/kidd0203/testing

Conflicts:
	index.html
Merge branch 'master' of https://github.com/kidd0203/testing

Conflicts:
	index.html