Merge remote-tracking branch 'origin/master'

Gemfile

@@ -2,8 +2,3 @@ source 'http://rubygems.org'
 
 gem 'oauth2'
 gem 'json'
-
-group :development, :test do
-  gem 'mailcatcher'
-  gem 'pry'
-end
\ No newline at end of file

Gemfile.lock

 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
     addressable (2.3.2)
-    coderay (1.0.7)
-    daemons (1.1.8)
-    eventmachine (0.12.10)
     faraday (0.7.6)
       addressable (~> 2.2)
       multipart-post (~> 1.1)
       rack (~> 1.1)
-    haml (3.1.7)
-    i18n (0.6.1)
     json (1.7.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mailcatcher (0.5.8)
-      activesupport (~> 3.0)
-      eventmachine (~> 0.12)
-      haml (~> 3.1)
-      mail (~> 2.3)
-      sinatra (~> 1.2)
-      skinny (~> 0.2, >= 0.2.1)
-      sqlite3 (~> 1.3)
-      thin (~> 1.2)
-    method_source (0.8)
-    mime-types (1.19)
     multi_json (1.3.6)
     multipart-post (1.1.5)
     oauth2 (0.5.2)
       faraday (~> 0.7)
       multi_json (~> 1.0)
-    polyglot (0.3.3)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
     rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    skinny (0.2.1)
-      eventmachine (~> 0.12)
-      thin (~> 1.2)
-    slop (3.3.3)
-    sqlite3 (1.3.6)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   json
-  mailcatcher
   oauth2
-  pry