first edit after first branch on master
firstBranch edit
second master edit
second first branch edit
the merge
crazy edit
Merge branch 'master' into crazy

Conflicts:
	README.txt
crazy to firstBranch merge