added two new files
updated file1.txt
updated file2.txt
Merge branches 'master', 'b1' and 'b2'