Correct search summary FOR <feed/index.html>
Correct search summary FOR <media/js/jquery-tapir.min.js>
Merge branch 'master' of https://github.com/Tong-Chen/tong-chen.github.com

Conflicts:
	media/js/jquery-tapir.min.js
Updated 404 FOR <404.html>