Committing to branch1
Commiting from hotfix1
More updates from branch1
Merge branch 'branch1'

Conflicts:
	README.txt
Commit from branch2