Kaitlyn is neat
Merge branch 'master' into goodness

Conflicts:
	UnitTests/obj/Debug/UnitTests.csprojResolveAssemblyReference.cache
Merge pull request #9 from clottman/goodness

Goodness