diff --git a/Gemfile b/Gemfile
index a3edbaf..e9a722f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,6 +31,8 @@ gem 'capistrano'
 gem 'capistrano-rails'
 gem 'capistrano-rvm'
 
+gem 'puma'
+
 group :development do
   gem 'spring'
   gem 'spring-commands-rspec'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8efbcca..4ea08c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -134,6 +134,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    puma (2.9.0)
+      rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -260,6 +262,7 @@ DEPENDENCIES
   jquery-rails
   pg
   phony_rails
+  puma
   rails (= 4.1.5)
   rails-erd
   rails-i18n