added bar.txt
added bar2
more bar
two lines added to foo
merged feature branch