I updated your file
Merge branch 'patch-1' of https://github.com/chilinchung/2014-12-21 into chilinchung-patch-1

Conflicts:
	index.html
Merge branch 'chilinchung-patch-1' into gh-pages