My commit message
Making more changes on the branch to checkout gitk
changes made to master
another change to test
something is fishy
Merge branch 'master' into test

Conflicts:
	Program.cs
strange.. will this change be in master or in test
added asdf
Merge branch 'test'
change 1 in test branch
change 2 to branch test
change 1 in master
Merge branch 'test'

Conflicts:
	Program.cs
change 4
change 3 in master
change 4 in master
change 5 in test
Merge branch 'master' into test

Conflicts:
	Program.cs
change 6 in test
change 7 in test