commit
commit
acomrea
commit
Merge branch 'master' into masterFork

Conflicts:
	bin/Debug/Satsuma.dll
	bin/Debug/Satsuma.pdb
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/Debug/Satsuma.csproj.FileListAbsolute.txt
	obj/Debug/Satsuma.csprojResolveAssemblyReference.cache
	obj/Debug/Satsuma.dll
	obj/Debug/Satsuma.pdb
commit
commit
commit
Merge pull request #10 from WesThompson/master

Tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	Satsuma.v12.suo
	bin/Debug/Satsuma.dll
	bin/Debug/Satsuma.pdb
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/Debug/Satsuma.csproj.FileListAbsolute.txt
	obj/Debug/Satsuma.csprojResolveAssemblyReference.cache
	obj/Debug/Satsuma.dll
	obj/Debug/Satsuma.pdb
Merge branch 'tyWork'