local1
local2
Merge remote-tracking branch 'remotes/origin/master'
confl1
confl2
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lib/simplegit.rb
changes on branch1
123
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	README