.
Merge branch 'master' of github.com:apetrovskiy/NH3

Conflicts:
	nh3test/nh3test/Program.cs
	nh3test/nh3test/bin/Debug/nh3test.exe
	nh3test/nh3test/bin/Debug/nh3test.pdb
	nh3test/nh3test/obj/x86/Debug/nh3test.exe
	nh3test/nh3test/obj/x86/Debug/nh3test.pdb
.
Merge branch 'master' of github.com:apetrovskiy/NH3

Conflicts:
	nh3test/nh3test/Program.cs
	nh3test/nh3test/bin/Debug/Iesi.Collections.dll
	nh3test/nh3test/bin/Debug/nh3test.exe
	nh3test/nh3test/bin/Debug/nh3test.pdb
	nh3test/nh3test/obj/x86/Debug/ResolveAssemblyReference.cache
	nh3test/nh3test/obj/x86/Debug/nh3test.exe
	nh3test/nh3test/obj/x86/Debug/nh3test.pdb