Merged multiple commits from branch1
commit21ANDcommit22
commit23
commit21ANDcommit22 and 23
Merge branch 'master' of https://github.com/sabram/git-test
Merge branch 'master' into branch1

Conflicts:
	a.txt
commit30 on branch1
commit31 on branch1