From 0a98bf399429e6d68846a6df905ef0f132769f7c Mon Sep 17 00:00:00 2001
From: Dan Barber <hello@danbarber.me>
Date: Tue, 15 Jul 2014 10:25:26 +0100
Subject: [PATCH] Update Gems.

---
 Gemfile      |  4 ++--
 Gemfile.lock | 57 ++++++++++++++++++++++++++++++++--------------------
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7c9cda6..20d1515 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,8 +5,8 @@ gem 'rake'
 gem 'jekyll'
 gem 'jekyll-assets'
 
-gem 'octopress', '~> 3.0.0.rc.10'
-gem 'octopress-deploy', '~> 1.0.0.rc.8'
+gem 'octopress', '~> 3.0.0.rc.12'
+gem 'octopress-deploy', '~> 1.0.0.rc.10'
 
 gem 'kramdown', '~> 1.3.3'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 88bb1d1..c1cbc9d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,84 +2,97 @@ GEM
   remote: https://rubygems.org/
   specs:
     blankslate (2.1.2.4)
-    bourbon (4.0.1)
+    bourbon (4.0.2)
       sass (~> 3.3)
       thor
     celluloid (0.15.2)
       timers (~> 1.1.0)
     classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.7.1)
     colorator (0.1)
-    execjs (2.0.2)
+    execjs (2.2.1)
     facets (2.9.3)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
     hike (1.2.3)
-    jekyll (2.0.3)
+    jekyll (2.1.1)
       classifier (~> 1.3)
       colorator (~> 0.1)
       jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.0)
       kramdown (~> 1.3)
-      liquid (~> 2.5.5)
-      listen (~> 2.5)
+      liquid (~> 2.6.1)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.5.0)
+      pygments.rb (~> 0.6.0)
       redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-assets (0.7.8)
+    jekyll-assets (0.8.1)
       jekyll (>= 1.0.0, < 3.0.0)
       sass
       sprockets (~> 2.10)
+      sprockets-helpers
+      sprockets-sass
     jekyll-coffeescript (1.0.0)
       coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-paginate (1.0.0)
     jekyll-sass-converter (1.0.0)
       sass (~> 3.2)
+    jekyll-watch (1.0.0)
+      listen (~> 2.7)
     json (1.8.1)
     kramdown (1.3.3)
-    liquid (2.5.5)
-    listen (2.7.5)
+    liquid (2.6.1)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    mercenary (0.3.3)
-    multi_json (1.10.0)
-    octopress (3.0.0.rc.10)
-      jekyll (~> 2.0, >= 2.0.0)
+    mercenary (0.3.4)
+    multi_json (1.10.1)
+    octopress (3.0.0.rc.12)
+      jekyll (~> 2.0)
       mercenary (~> 0.3.2)
-    octopress-deploy (1.0.0.rc.8)
+    octopress-deploy (1.0.0.rc.10)
       colorator
       octopress (~> 3.0.0.rc.10)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.8)
-    pygments.rb (0.5.4)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (3.1.2)
     safe_yaml (1.0.3)
-    sass (3.3.7)
+    sass (3.3.10)
     sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-helpers (1.1.0)
+      sprockets (~> 2.0)
+    sprockets-sass (1.2.0)
+      sprockets (~> 2.0)
+      tilt (~> 1.1)
     thor (0.19.1)
     tilt (1.4.1)
     timers (1.1.0)
     toml (0.1.1)
       parslet (~> 1.5.0)
-    uglifier (2.5.0)
+    uglifier (2.5.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     yajl-ruby (1.1.0)
@@ -93,8 +106,8 @@ DEPENDENCIES
   jekyll
   jekyll-assets
   kramdown (~> 1.3.3)
-  octopress (~> 3.0.0.rc.10)
-  octopress-deploy (~> 1.0.0.rc.8)
+  octopress (~> 3.0.0.rc.12)
+  octopress-deploy (~> 1.0.0.rc.10)
   rake
   sass
   uglifier