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

Conflicts:
	foobar.txt
Merge pull request #2 from cheempz/one

One