adds show action and view template to video controller.
adds popcorn js as gem.
very simple show page for entry/video.
Merge branch 'master' of github.com:railsrumble/r13-team-39

Conflicts:
	app/controllers/videos_controller.rb