调整模板
Merge branch 'master' of github.com:samrain/samrain.github.com

Conflicts:
	_posts/2013-03-11-study-VI.md