Commit 1 Master 1
Commit 2 Master 2
Commit 3 Branch 1
Commit 4 Branch 2
Commit 5 Master 3
Commit 6 Master 4
Commit 7 Branch 3
Commit 8 Branch 4
Fix Merge Conflict

Merge branch 'master' into somebranch

Conflicts:
	version.txt