added file2 to b1
Merge remote-tracking branch 'origin/b1'