Merge branch 'master' into fixes/diff-service-test

Author: StanleyGoldman

.gitignore

@@ -26,9 +26,10 @@ build/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-#NUNIT
+# NUnit
 *.VisualState.xml
 TestResult.xml
+nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -241,5 +242,4 @@ output.binlog
 AkavacheSqliteLinkerOverride.cs
 NuGetBuild
 WiX.Toolset.DummyFile.txt
-nunit-*.xml
 GitHubVS.sln.DotSettings