Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master-fix

public/stylesheets/sass/application.sass

@@ -261,7 +261,12 @@ header
     :-webkit-border-radius 5px
     :-moz-border-radius 5px
     :border-radius 5px
-
+    	
+    .youtube-player
+      :border none
+      :height: 325px
+      :width: 500px
+		 
 .from
   :font
     :family 'Helvetica neue', Arial, Helvetica, sans-serif
@@ -570,6 +575,11 @@ ul.comments
     :border
       :bottom 1px solid #ddd
 
+    .youtube-player
+      :border none
+      :height: 250px
+      :width: 400px
+
     .content
       :color #777
       :margin
@@ -1978,4 +1988,3 @@ h3,h4
 #edit_aspect_trigger
   :font
     :size 12px
-