git笔记
Merge branch 'master' of github.com:tesla-cm/tesla-cm.github.com

Conflicts:
	_posts/git/2013-06-04-git-base.md