error fixes

Gemfile.lock

@@ -41,6 +41,7 @@ GEM
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
     arel (3.0.3)
+    attr_required (1.0.0)
     awesome_nested_set (2.1.6)
       activerecord (>= 3.0.0)
     bcrypt-ruby (3.1.2)
@@ -83,6 +84,11 @@ GEM
       railties (>= 3.0.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
+    fb_graph (2.7.15)
+      httpclient (>= 2.2.0.2)
+      multi_json (>= 1.3)
+      rack-oauth2 (>= 0.14.4)
+      tzinfo
     font-awesome-rails (4.0.3.1)
       railties (>= 3.2, < 5.0)
     formtastic (2.2.1)
@@ -114,6 +120,7 @@ GEM
     hashie (2.0.5)
     hike (1.2.3)
     httpauth (0.2.0)
+    httpclient (2.4.0)
     i18n (0.6.1)
     journey (1.0.4)
     jquery-fileupload-rails (0.4.1)
@@ -171,6 +178,12 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-oauth2 (1.0.8)
+      activesupport (>= 2.3)
+      attr_required (>= 0.0.5)
+      httpclient (>= 2.2.0.2)
+      multi_json (>= 1.3.6)
+      rack (>= 1.1)
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
@@ -247,11 +260,11 @@ GEM
     warden (1.2.3)
       rack (>= 1.0)
     webrick (1.3.1)
-<<<<<<< Updated upstream
     wikicloth (0.8.1)
       builder
       expression_parser
       rinku
+
 PLATFORMS
   ruby
 
@@ -267,6 +280,7 @@ DEPENDENCIES
   devise (~> 2.2.3)
   execjs (~> 1.4.0)
   factory_girl_rails
+  fb_graph
   font-awesome-rails
   formtastic (~> 2.2.1)
   formtastic-bootstrap (~> 2.1.3)