[issue #2]创建分支并提交
[issue #2]第二次提交
[issue #2]新增一个文件，2014-5-16 16：19
[issue #2 fix #2]修复并关闭
[issue #2 fixes #2]关闭
[issue #1]新分支
[issue #1]问题一修改
[issue #1]今日再次提交
[issue #1]猛提交
[issue #1]测试一下远程提交
[issue #1]1405
[issue #2]又有更改
Merge branch 'develop_2' into develop

Conflicts:
	test.txt
	test2.txt