fixing conflict

diff --cc marketing/docs/gem-install.php
Simple merge

diff --cc marketing/sass/docs/presentation.scss
Simple merge

diff --cc marketing/stylesheets/docs/presentation.css
index 47c39f6cc597513de32fba5bcb766d7cc36022dd,9d47cd51e792103a1972509e654d9d43ab17bab4..dc16101a0632dfa35f82bdeced4f1d3e19251e57
--- 1/marketing/stylesheets/docs/presentation.css
--- 2/marketing/stylesheets/docs/presentation.css
+++ b/marketing/stylesheets/docs/presentation.css
@@@ -999,12 -1000,12 +999,12 @@@ header .subheader { position: relative
    .top-bar .attached > ul > li > a, .top-bar .attached > ul > li > span { padding-left: 0px; padding-right: 0px; }
    .top-bar .attached > ul > li.download a { margin-bottom: 30px !important; margin-top: 10px; }
    .top-bar .attached > .name > span > a.toggle-nav { right: -45px !important; } }
- @media only screen and (orientation: portrait) and (min-device-width: 768px) { .top-bar { height: 100%; }
-   .touch .top-bar { height: 45px !important; }
+ @media only screen and (orientation: portrait) { .top-bar { overflow: hidden; height: 45px; }
+   .top-bar.expanded { height: auto !important; }
    .touch .top-bar .attached { height: 45px !important; }
    .touch .top-bar .attached > ul.right { overflow: hidden; height: 45px !important; } }
 -@media only screen and (orientation: landscape) { .touch .top-bar .attached > ul.right { height: 45px !important; overflow: hidden !important; } }
 -@media only screen and (-moz-min-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) { .top-bar .attached > .name span > a.toggle-nav { background-image: url('../../images/plus-toggle-2-retina.png?1340839300'); background-size: 100% 100%; } }
 +@media only screen and (orientation: landscape) and (min-device-width: 768px) { .touch .top-bar .attached > ul.right { height: 45px !important; overflow: hidden !important; } }
 +@media only screen and (-moz-min-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) { .top-bar .attached > .name span > a.toggle-nav { background-image: url('../../images/plus-toggle-2-retina.png?1340842456'); background-size: 100% 100%; } }
  #megaDrop li { list-style: none; }
  
  #megaDrop .show-on-phones, #megaDrop .sitemap-link { display: none !important; }