Merge branch 'master' into gh-pages

Author: stephen grider

.gitignore

@@ -1,6 +1,8 @@
-_site
-.sass-cache
-.DS_Store
-
 # Ignore the config file that's used for gh-pages.
 _config.gh-pages.yml
+_site/
+.sass-cache/
+node_modules/
+.DS_Store
+Gemfile.lock
+npm-debug.log

_config.yml

@@ -50,5 +50,6 @@ redcarpet:
   extensions: ['smart', 'tables', 'with_toc_data']
 permalink:    :title
 paginate:     10
+gems: [jekyll-paginate]
 sass:
   compressed: true

_layouts/default.html

@@ -11,7 +11,7 @@
           <span>
             <span class="carbon-wrap">
               <a href="https://www.udemy.com/react-redux/?couponCode=325152" onclick="trackOutboundLink('https://www.udemy.com/react-redux/?couponCode=325152'); return false;" class="carbon-img" target="_blank">
-                <img src="https://reactjsnews.com/img/ModernReact.jpg" alt="" border="0" height="100" width="130" style="max-width:130px;">
+                <img src="/img/ModernReact.jpg" alt="" border="0" height="100" width="130" style="max-width:130px;">
               </a>
               <a href="https://www.udemy.com/react-redux/?couponCode=325152" onclick="trackOutboundLink('https://www.udemy.com/react-redux/?couponCode=325152'); return false;" class="carbon-text" target="_blank">
                 90% Off: Get up to speed with React and Redux through the highest-rated online tutorial.