second checkin
my commit message
Merge branch 'newBranchNowWithExtraProject' of https://github.com/JustinAngel/test2 into newBranchNowWithExtraProject

Conflicts:
	ConsoleApplication1/ConsoleApplication1/Program.cs