Merge branch 'gh-pages' of https://github.com/kuangwk/mini-project.git into gh-pages

Conflicts:
	index.html