Merge branch 'hotfix/1.0.4'

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.0.4
+-----
+* Updated gems
+
 1.0.3
 -----
 * Fixed Heroku link in README

Gemfile.lock

@@ -64,7 +64,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     colorize (0.5.8)
     columnize (0.3.6)
     commonjs (0.2.6)
@@ -110,7 +110,7 @@ GEM
     i18n (0.6.4)
     i18n-js (2.1.2)
       i18n
-    jquery-rails (3.0.1)
+    jquery-rails (3.0.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-turbolinks (1.0.0)
@@ -147,7 +147,7 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.1)
       pry (>= 0.9.10)
-    puma (2.2.0)
+    puma (2.3.0)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-contrib (1.1.0)
@@ -239,7 +239,7 @@ GEM
       rack
       raindrops (~> 0.7)
     uniform_notifier (1.2.0)
-    webmock (1.12.3)
+    webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
     websocket (1.0.7)

VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4