add updates to videos
Merge remote-tracking branch 'upstream/master'
fix likes and dislikes
Merge remote-tracking branch 'upstream/master'
fix tags
	modified:   app/controllers/admin/videos_controller.rb
	modified:   app/controllers/videos_controller.rb
	modified:   app/helpers/application_helper.rb
	modified:   app/models/video.rb
	modified:   app/views/pages/home.html.erb
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/video.rb

	modified:   app/models/video.rb
fix auth
fix name
fix oauth
fix oauth
add google oauth2
fix oauth
fix email
Fix oauth
fix users
fix logins
Fix oauth
fix oauth
fix oauth