now showing the real videos and posterframes in search
Merge branch 'master' of github.com:railsrumble/r13-team-39

Conflicts:
	app/views/videos/_entry.html.erb
Merge branch 'master' of github.com:railsrumble/r13-team-39