fix web
Merge branch 'master' of https://github.com/KuanYuChen/KuanYuChen.github.io

Conflicts:
	feeds/all.atom.xml