Test index.html
Merge branch 'master' of https://github.com/ethanjin/ethanjin.github.io

Conflicts:
	index.html
clean
Merge branch 'master' of https://github.com/ethanjin/ethanjin.github.io

Conflicts:
	2014/11/24/hello-world/index.html
	archives/2014/11/index.html
	archives/2014/index.html
	archives/index.html
	index.html