Bring up-to-date with content changes on origin/master

Merge remote-tracking branch 'origin/master' into no-more-includes-for-slides
Resolved "Platform Survey" content order for "Teams" and "Organizations" slides

Conflicts:
	foundations/index.md

Author: jordanmccullough

foundations/index.md

@@ -118,18 +118,19 @@ The command line version of Git has a very light footprint. For most platforms,
 
 ---
 
-<span class="mega-octicon octicon-jersey"></span>
-#### Teams
+<span class="mega-octicon octicon-organization"></span>
+#### Organizations
 
 ---
 
 ---
 
-<span class="mega-octicon octicon-organization"></span>
-#### Organizations
+<span class="mega-octicon octicon-jersey"></span>
+#### Teams
 
 ---
 
+
 {% capture lab %}
 * Describe the difference between the Git DVCS and GitHub collaboration platform
 * Access the common project components of daily GitHub interactions