no message
no message
Merge branch 'master' of https://github.com/xingsheng/xingsheng.github.io
Merge branch 'master' of https://github.com/xingsheng/xingsheng.github.io
no message
no message
Merge branch 'master' of https://github.com/xingsheng/xingsheng.github.io
CNAME
Merge branch 'master' of https://github.com/xingsheng/xingsheng.github.io

Conflicts:
	CNAME
Merge branch 'master' of https://github.com/xingsheng/xingsheng.github.io
Merge branch 'master' of https://github.com/xingsheng/xingsheng.github.io