modify
Merge branch 'master' of https://github.com/figot/figot.github.com

Conflicts:
	_posts/2013-11-29-C++11之智能指针(上).md