Handled conflicts, throwing out changes to ladder_tab.coffee.

app/lib/services/facebook.coffee

@@ -1,7 +1,6 @@
 module.exports = initializeFacebook = ->
   # Additional JS functions here
   window.fbAsyncInit = ->
-    Backbone.Mediator.publish "fbapi-loaded"
     FB.init
       appId: (if document.location.origin is "http://localhost:3000" then "607435142676437" else "148832601965463") # App ID
       channelUrl: document.location.origin + "/channel.html" # Channel File
@@ -9,13 +8,14 @@ module.exports = initializeFacebook = ->
       cookie: true # enable cookies to allow the server to access the session
       xfbml: true # parse XFBML
 
-    
+    Backbone.Mediator.publish "fbapi-loaded"
+
     # This is fired for any auth related change, such as login, logout or session refresh.
     FB.Event.subscribe "auth.authResponseChange", (response) ->
-      
-      # Here we specify what we do with the response anytime this event occurs. 
+
+      # Here we specify what we do with the response anytime this event occurs.
       if response.status is "connected"
-        
+
         # They have logged in to the app.
         Backbone.Mediator.publish "facebook-logged-in",
           response: response
@@ -23,7 +23,7 @@ module.exports = initializeFacebook = ->
       else if response.status is "not_authorized"
         #
       else
-	      # 
+	      #
 
   # Load the SDK asynchronously
   ((d) ->
@@ -35,8 +35,8 @@ module.exports = initializeFacebook = ->
     js.id = id
     js.async = true
     js.src = "//connect.facebook.net/en_US/all.js"
-    
-    #js.src = "//connect.facebook.net/en_US/all/debug.js";
+
+    #js.src = "//connect.facebook.net/en_US/all/debug.js"
     ref.parentNode.insertBefore js, ref
     return
   ) document