将ide配置文件加入.gitignore文件
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.markdown