Merge branch 'master' into update7post

.gitignore

@@ -3,5 +3,4 @@ _site
 .jekyll-metadata
 app_service_code_workspace.code-workspace
 .vs/slnx.sqlite
-.vs/VSWorkspaceState.json
-.vs/AppService/v16/.suo
+.vs/VSWorkspaceState.json

index.html

@@ -14,6 +14,7 @@ header:
 <ul>
     <li><a href="https://github.com/Azure/app-service-linux-docs" target="_blank">Linux Best Practices and FAQ</a></li>
     <li><a href="https://github.com/Azure-Samples/java-on-app-service" target="_blank">Java on App Service</a></li>
+    <li><a href="https://aka.ms/appservicewindowscontainerwiki" target="_blank">Windows Containers on App Service</a></li>
 </ul>
 
 <h3>Other Blogs</h3>