change something
s
Merge branch 'master' of github.com:nkzhimingyuan/nkzhimingyuan.github.io

Conflicts:
	_posts/2014-12-28-我的2014.md