Attempt to fix tests - can run program now
Merge remote-tracking branch 'origin/master'

Conflicts:

	CalendarSystemPrototype/CalendarSystemPrototype/bin/Debug/CalendarSystemPrototype.exe

	CalendarSystemPrototype/CalendarSystemPrototype/bin/Debug/CalendarSystemPrototype.pdb

	CalendarSystemPrototype/CalendarSystemPrototype/obj/Debug/CalendarSystemPrototype.exe

	CalendarSystemPrototype/CalendarSystemPrototype/obj/Debug/CalendarSystemPrototype.pdb

	CalendarSystemPrototype/CalendarSystemPrototypeTests/bin/Debug/CalendarSystemPrototype.exe

	CalendarSystemPrototype/CalendarSystemPrototypeTests/bin/Debug/CalendarSystemPrototype.pdb

	CalendarSystemPrototype/CalendarSystemPrototypeTests/bin/Debug/CalendarSystemPrototypeTests.dll

	CalendarSystemPrototype/CalendarSystemPrototypeTests/bin/Debug/CalendarSystemPrototypeTests.pdb

	CalendarSystemPrototype/CalendarSystemPrototypeTests/obj/Debug/CalendarSystemPrototypeTests.csprojResolveAssemblyReference.cache

	CalendarSystemPrototype/CalendarSystemPrototypeTests/obj/Debug/CalendarSystemPrototypeTests.dll

	CalendarSystemPrototype/CalendarSystemPrototypeTests/obj/Debug/CalendarSystemPrototypeTests.pdb
qwe

tre