git idea maven配置
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-10-31-给自己的一些话.md