ad
Merge branches 'master' and 'master' of https://github.com/LinkYan/LinkYan.github.io

Conflicts:
	_posts/2013-05-10-态度决定一切.md