test merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	GitExperimentingApp/Program.cs