x
Merge branch 'master' of https://github.com/MichaelBuen/TestAggregate

Conflicts:
	TestAggregate/bin/Debug/TestAggregate.exe
	TestAggregate/obj/x86/Debug/TestAggregate.exe