分支提交
大苏打
add new
delete an
add new
add new
Merge branch 'tmp' into local20140820

Conflicts:
	new
Merge remote-tracking branch 'origin/20140821'

Conflicts:
	new
delete
add
dd
modify new