Merge branch 'master' into master

Author: manshreck

_includes/side-nav-fast.html

@@ -1,7 +1,11 @@
 <ul class="doc-side-nav">
    <li><h5 class="doc-side-nav-title">
-    <a href="{{ site.baseurl }}/fast/">Fast Tips</a></h5>
+    <a href="{{ site.baseurl }}/fast/">Performance Guide</a></h5>
    </li>
+   <li><h6 class="doc-side-nav-title">
+       <a href="hints.html">Performance Hints</a></h6>
+   </li>
+   <li><h6 class="doc-side-nav-title">Fast Tips</h6></li>
    {% assign sorted_posts = site.posts | sort: 'order' %}
 
    {% for post in sorted_posts %}

_includes/sticky-nav.html

@@ -20,7 +20,7 @@
           <li><a href="{{ site.baseurl }}/about" {% if current[1] == 'about' %}class='current'{% endif %}>About</a></li>
           <li><a href="{{ site.baseurl }}/docs/cpp" {% if current[1] == 'cpp.html' %}class='current'{% endif %}>C++ Guide</a></li>
           <li><a href="{{ site.baseurl }}/tips/" {% if current[1] == 'tips' %}class='current'{% endif %}>C++ Tips</a></li>
-          <li><a href="{{ site.baseurl }}/fast/" {% if current[1] == 'fast' %}class='current'{% endif %}Fast Tips</a></li>
+          <li><a href="{{ site.baseurl }}/fast/" {% if current[1] == 'fast' %}class='current'{% endif %}>Fast Tips</a></li>
           <li><a href="{{ site.baseurl }}/docs/python" {% if current[1] == 'python.html' %}class='current'{% endif %}>Python Guide</a></li>
           <li><a href="{{ site.baseurl }}/blog/" {% if current[1] == 'blog' %}class='current'{% endif %}>Blog</a></li>
           <li><a href="{{ site.baseurl }}/community/" {% if current[1] == 'community' %}class='current'{% endif %}>Community</a></li>