add a writeline to master
Merge branch 'oddstuff'

Conflicts:
	GitTest/Program.cs
add somestuff
add master change