reload youtube
Merge branch 'master' of https://github.com/retani/wwhs

Conflicts:
	app/controllers/jmpress_controller.rb