Committing on conflict
Merge branch 'master' of github.com:akstest/repo2

Conflicts:
	TestGitProject3/Program.cs