struggling with detail redesign
Merge branch 'master' of https://github.com/chaim1221/MacheteStub

Conflicts:
	MacheteStub/MacheteStub.Tests/MacheteStub.Tests.csproj
	MacheteStub/MacheteStub.Tests/UnitTest1.cs