Resubmit lost commit
Merge branch 'master' of github.com:shichao-an/shichao-an.github.io

Conflicts:
	searchindex.js