index file added
Merge branch 'master' into branch1
txt1 file modified..
txt1 file modified...
merged files from branch1 updated