modified:   ~syi/index.html
Merge branch 'master' of https://github.com/yishanhe/yishanhe.github.com

Conflicts:
	~syi/index.html