commit 2
123
reset branch
Merge branch 'master' of https://github.com/xewelus/Test

Conflicts:
	Copy of Program.cs