Merge branch 'feature/social_buttons' into develop

web/app/assets/stylesheets/web/welcome.css.scss

@@ -18,6 +18,14 @@ body.web {
       }
     }
   }
+
+  .follow-links {
+    position: absolute;
+    right: 0;
+    top: -60px;
+    z-index: 100000;
+  }
+
   .share_links {
     position: absolute;
     top: 116px;

web/app/views/users/welcome.html.haml

@@ -7,9 +7,9 @@
     = link_to image_tag("web/cta_button.png", :alt => "Sign up now for your free account!"), signup_path, class: "signup", id: "signup"
     .clearleft
     = link_to "Already have an account?", signin_path, class: "signin", id: "signin"
-= render :partial => 'users/share_links'
 
 - content_for :after_black_bar do
+  = render :partial => 'users/follow_links'
   - if @jamfest_2014
     .jamfest{style: 'top:-70px;position:relative'}
       %a{ href: event_path(@jamfest_2014.slug), style: 'font-size:20px;margin-top:11px' }