finished implementing SitePoint's YouTube on Rails
fixed conflicts
fixed conflicts