added puma

Author: framallo

Gemfile

@@ -14,6 +14,7 @@ gem 'pg'
 gem 'omniauth-google-oauth2'
 
 gem 'acts-as-taggable-on'
+gem 'puma'
 
 group :development do
   gem 'spring'

Gemfile.lock

@@ -1,5 +1,4 @@
 GEM
-  remote: https://rubygems.org/
   specs:
     actionmailer (4.1.0.beta1)
       actionpack (= 4.1.0.beta1)
@@ -33,7 +32,7 @@ GEM
     arel (5.0.0)
     atomic (1.1.14)
     builder (3.2.2)
-    capybara (2.2.0)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -76,7 +75,7 @@ GEM
     guard-rspec (4.2.2)
       guard (~> 2.1, >= 2.1)
       rspec (~> 3.0.0.beta, >= 2.14, < 4.0)
-    haml (4.0.4)
+    haml (4.0.5)
       tilt
     haml-rails (0.5.3)
       actionpack (>= 4.0.1)
@@ -124,7 +123,7 @@ GEM
     omniauth (1.1.4)
       hashie (>= 1.2, < 3)
       rack
-    omniauth-google-oauth2 (0.2.1)
+    omniauth-google-oauth2 (0.2.2)
       omniauth (~> 1.0)
       omniauth-oauth2
     omniauth-oauth2 (1.1.1)
@@ -139,6 +138,8 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
+    puma (2.7.1)
+      rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -251,6 +252,7 @@ DEPENDENCIES
   os
   pg
   pry-rails
+  puma
   rails (= 4.1.0.beta1)
   rspec-rails (~> 3.0.0.beta)
   sass-rails (~> 4.0.0.rc1)