diff --git a/Gemfile b/Gemfile
index b2538ea..131b7c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,13 +9,13 @@ gem 'rake', '0.8.7'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-#gem 'mysql2', '0.3.7'
-gem 'sqlite3'
+gem 'mysql2', '0.2.7'
+#gem 'sqlite3'
 
 # https://github.com/plataformatec/devise
 gem 'devise', '1.2.1'
-#  gem 'bcrypt-ruby', '2.1.4'
-gem 'bcrypt-ruby'
+gem 'bcrypt-ruby', '2.1.4'
+#gem 'bcrypt-ruby'
 
 # https://github.com/ryanb/cancan
 gem 'cancan', '1.6.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5c585f4..80e8bbe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,36 +48,38 @@ GEM
     faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)
     faraday_middleware (0.6.5)
       faraday (~> 0.6.0)
     hashie (1.0.0)
-    highline (1.6.1)
+    highline (1.6.9)
     i18n (0.5.0)
+    json (1.6.4)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.3)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
     multi_xml (0.2.2)
-    multipart-post (1.1.2)
+    multipart-post (1.1.4)
     mysql2 (0.2.7)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.1.4)
-    net-ssh-gateway (1.0.1)
+    net-ssh (2.3.0)
+    net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    orm_adapter (0.0.4)
-    polyglot (0.3.1)
-    rack (1.2.2)
+    orm_adapter (0.0.6)
+    polyglot (0.3.3)
+    rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
+    railroady (1.0.4)
     rails (3.0.9)
       actionmailer (= 3.0.9)
       actionpack (= 3.0.9)
@@ -93,10 +95,12 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rdoc (3.8)
+    rdoc (3.12)
+      json (~> 1.4)
     simple_oauth (0.1.5)
     thor (0.14.6)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
     twitter (1.6.0)
       faraday (~> 0.6.1)
@@ -105,13 +109,12 @@ GEM
       multi_json (~> 1.0.0)
       multi_xml (~> 0.2.0)
       simple_oauth (~> 0.1.5)
-    tzinfo (0.3.26)
-    warden (1.0.3)
-      rack (>= 1.0.0)
+    tzinfo (0.3.31)
+    warden (1.0.6)
+      rack (>= 1.0)
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
   bcrypt-ruby (= 2.1.4)
@@ -119,6 +122,7 @@ DEPENDENCIES
   capistrano (= 2.5.21)
   devise (= 1.2.1)
   mysql2 (= 0.2.7)
+  railroady
   rails (= 3.0.9)
   rake (= 0.8.7)
   twitter (= 1.6.0)