Merge pull request #10400 from FreeCodeCamp/backup/staging

Release staging

server/views/map/show.jade

@@ -36,8 +36,9 @@ block content
                                           a(href="#{challenge.url}" target='_parent')
                                               = challenge.title
                                               span.sr-only= " Complete"
+                                          if challenge.isRequired
                                               span.text-primary    
-                                                  strong *
+                                                strong *
                                   else if challenge.isRequired
                                       p.challenge-title.ion-ios-circle-outline.padded-ionic-icon.negative-15(name="#{challenge.dashedName}")
                                           a(name="#{challenge.dashedName}" target='_parent' href="#{challenge.url}" class=challenge.isComingSoon ? 'disabled' : '')

server/views/resources/shop.jade

@@ -1,6 +1,13 @@
 extends ../layout
 block content
     h2.text-center Buy through us and support our open source community
+    .row
+        .col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center
+            img.img-responsive.img-center(src='//i.imgur.com/VVuE4Tl.jpg')
+            h3 It's all talk until the code runs T-shirt - $24.99
+            p Ward Cunningham, inventor of the wiki, famously said, "It's all talk until the code runs." Spread his wisdom with this jet black t-shirt.
+            p Also available in high quality American Apparel women's fitted tee sizes.
+            a.btn.btn-cta.signup-btn.btn-block(href='http://bit.ly/2bQ97AU' target='_blank' onClick="ga('send', 'event', 'Shop', 'clicked', 'all talk tshirt');") Get this sweet shirt
 
     hr
     .row
@@ -8,7 +15,7 @@ block content
             img.img-responsive.img-center(src='//i.imgur.com/Mei70nv.jpg')
             h3 Celebrate the Open Data Movement T-shirt - $19.99
             p All around the world, scientists and governments are releasing open data. Free Code Camp's datasets are among the most popular with Kaggle's community of 600,000+ data scientists.
-            p This shirt is also available in a high quality American Apparel women's fitted tee.
+            p Also available in high quality American Apparel women's fitted tee sizes.
             a.btn.btn-cta.signup-btn.btn-block(href='http://bit.ly/2aW3AcT' target='_blank' onClick="ga('send', 'event', 'Shop', 'clicked', 'open data tshirt');") Get this awesome shirt
 
     hr
@@ -29,7 +36,7 @@ block content
     hr
     .row
         .col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center
-            img.img-responsive.img-center(src='http://i.imgur.com/gr51Dyor.jpg')
+            img.img-responsive.img-center(src='//i.imgur.com/gr51Dyor.jpg')
             h3 The Innovators: How a Group of Hackers, Geniuses, and Geeks Created the Digital Revolution
             p Get this audiobook and another of your choosing for free with an Audible free trial.
             a.btn.btn-cta.signup-btn.btn-block(target='_blank' href="http://amzn.to/2aZVCR6" onClick="ga('send', 'event', 'Shop', 'clicked', '2 free audio books');") Get this audiobook for free
@@ -40,7 +47,7 @@ block content
             img.img-responsive.img-center(src='//i.imgur.com/H4q9EAo.jpg')
             h3 Rabbit Skins Baby Onesie - $19.99
             p Inspire your baby to become a coder! These onesies come in pink and green, and range in size from 6 months to 2 years old.
-            a.btn.btn-cta.signup-btn.btn-block(href='http://bit.ly/2b4Gq12' target='_blank' onClick="ga('send', 'event', 'Shop', 'clicked', 'open data onesie');") Get this adorable Onesie
+            a.btn.btn-cta.signup-btn.btn-block(href='http://bit.ly/2b4Gq12' target='_blank' onClick="ga('send', 'event', 'Shop', 'clicked', 'open data onesie');") Get this adorable onesie
 
     hr
     .row