1 added some text
2 added some text
merged branch1 with master