From: Mark Otto <markdotto@gmail.com>
Date: Mon, 22 Jun 2015 00:13:16 +0000 (-0700)
Subject: Merge branch 'master' into gh-pages
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=512002eaa78a74e3a0825ce487d124c951e52452;hp=84e75644dda47abc6a24f1bf332b863f518ab950;p=blog

Merge branch 'master' into gh-pages
---

diff --git a/_config.yml b/_config.yml
index fddf614..110131e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -25,6 +25,6 @@ author:
   email:             markdotto@gmail.com
 
 # Custom vars
-version:             1.0.0
+version:             2.0.0
 github:
   repo:              https://github.com/poole/poole