[two] added barfoo.txt
Merge remote-tracking branch 'origin/two' into one
updated foobar.txt
Merge remote-tracking branch 'origin/master' into one

Conflicts:
	foobar.txt