From 88b42ffae7a739bd4ff2dab9cf5df915329d2fab Mon Sep 17 00:00:00 2001
From: Dan Barber <hello@danbarber.me>
Date: Sun, 14 Sep 2014 13:47:53 +0100
Subject: [PATCH] Update gems.

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

diff --git a/Gemfile b/Gemfile
index 20d1515..3352c69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,8 +5,8 @@ gem 'rake'
 gem 'jekyll'
 gem 'jekyll-assets'
 
-gem 'octopress', '~> 3.0.0.rc.12'
-gem 'octopress-deploy', '~> 1.0.0.rc.10'
+gem 'octopress', '~> 3.0.0.rc.14'
+gem 'octopress-deploy', '~> 1.0.0.rc.11'
 
 gem 'kramdown', '~> 1.3.3'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c1cbc9d..85346bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,28 +5,29 @@ GEM
     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)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.1)
+      fast-stemmer (~> 1.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
+    coffee-script-source (1.8.0)
     colorator (0.1)
     execjs (2.2.1)
     facets (2.9.3)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
     hike (1.2.3)
-    jekyll (2.1.1)
-      classifier (~> 1.3)
+    hitimes (1.2.2)
+    jekyll (2.4.0)
+      classifier-reborn (~> 2.0)
       colorator (~> 0.1)
       jekyll-coffeescript (~> 1.0)
       jekyll-gist (~> 1.0)
       jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.0)
+      jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
       liquid (~> 2.6.1)
       mercenary (~> 0.3.3)
@@ -34,19 +35,19 @@ GEM
       redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-assets (0.8.1)
+    jekyll-assets (0.9.2)
       jekyll (>= 1.0.0, < 3.0.0)
-      sass
+      sass (~> 3.2)
       sprockets (~> 2.10)
       sprockets-helpers
       sprockets-sass
-    jekyll-coffeescript (1.0.0)
+    jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
     jekyll-gist (1.1.0)
     jekyll-paginate (1.0.0)
-    jekyll-sass-converter (1.0.0)
+    jekyll-sass-converter (1.2.1)
       sass (~> 3.2)
-    jekyll-watch (1.0.0)
+    jekyll-watch (1.1.1)
       listen (~> 2.7)
     json (1.8.1)
     kramdown (1.3.3)
@@ -57,15 +58,16 @@ GEM
       rb-inotify (>= 0.9)
     mercenary (0.3.4)
     multi_json (1.10.1)
-    octopress (3.0.0.rc.12)
+    octopress (3.0.0.rc.14)
       jekyll (~> 2.0)
       mercenary (~> 0.3.2)
-    octopress-deploy (1.0.0.rc.10)
+      titlecase
+    octopress-deploy (1.0.0.rc.11)
       colorator
       octopress (~> 3.0.0.rc.10)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    posix-spawn (0.3.8)
+    posix-spawn (0.3.9)
     pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
@@ -76,8 +78,8 @@ GEM
       ffi (>= 0.5.0)
     redcarpet (3.1.2)
     safe_yaml (1.0.3)
-    sass (3.3.10)
-    sprockets (2.12.1)
+    sass (3.4.3)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -89,10 +91,12 @@ GEM
       tilt (~> 1.1)
     thor (0.19.1)
     tilt (1.4.1)
-    timers (1.1.0)
+    timers (4.0.1)
+      hitimes
+    titlecase (0.1.1)
     toml (0.1.1)
       parslet (~> 1.5.0)
-    uglifier (2.5.1)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     yajl-ruby (1.1.0)
@@ -106,8 +110,8 @@ DEPENDENCIES
   jekyll
   jekyll-assets
   kramdown (~> 1.3.3)
-  octopress (~> 3.0.0.rc.12)
-  octopress-deploy (~> 1.0.0.rc.10)
+  octopress (~> 3.0.0.rc.14)
+  octopress-deploy (~> 1.0.0.rc.11)
   rake
   sass
   uglifier