foo
foo123
bar
me
Merge remote-tracking branch 'origin/issue01' into devel-01

Conflicts:
	README
Merge remote-tracking branch 'origin/issue02' into devel-01
you
Merge remote-tracking branch 'origin/issue04' into devel-01
Merge remote-tracking branch 'origin/issue03' into devel-01
Merge remote-tracking branch 'origin/issue01' into devel-01
foo3