finished user functionality, added favourite artists

Gemfile.lock

@@ -40,10 +40,11 @@ GEM
     bcrypt-ruby (2.1.4)
     bcrypt-ruby (2.1.4-x86-mingw32)
     builder (2.1.2)
-    closure (1.2.701)
+    closure (1.3.0)
       rack (>= 1.0.0)
+    cocaine (0.1.0)
     daemons (1.0.10)
-    devise (1.3.4)
+    devise (1.4.0)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
@@ -64,10 +65,10 @@ GEM
     i18n (0.6.0)
     jammit (0.6.3)
       yui-compressor (>= 0.9.3)
-    jquery-rails (1.0.9)
+    jquery-rails (1.0.12)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.5.1)
+    json (1.5.3)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -94,15 +95,16 @@ GEM
       oa-core (= 0.2.6)
       rack-openid (~> 1.3.1)
       ruby-openid-apps-discovery (~> 1.2.0)
-    oauth (0.4.4)
+    oauth (0.4.5)
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
-    open4 (1.0.1)
+    open4 (1.1.0)
     orm_adapter (0.0.5)
-    paperclip (2.3.11)
+    paperclip (2.3.12)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
+      cocaine (>= 0.0.2)
     peachy (0.4.1)
     polyglot (0.3.1)
     rack (1.2.3)
@@ -135,7 +137,7 @@ GEM
       ruby-openid (>= 2.1.7)
     ruby_parser (2.0.6)
       sexp_processor (~> 3.0)
-    sass (3.1.2)
+    sass (3.1.3)
     sexp_processor (3.0.5)
     sqlite3 (1.3.3)
     sqlite3 (1.3.3-x86-mingw32)
@@ -147,7 +149,7 @@ GEM
     typhoeus (0.2.4)
       mime-types
       mime-types
-    tzinfo (0.3.27)
+    tzinfo (0.3.29)
     warden (1.0.4)
       rack (>= 1.0)
     will_paginate (2.3.15)