pulling after new video pages
Merge branch

Conflicts:
	Gemfile.lock
	app/controllers/home_controller.rb