trailers on homepage
Merge branch 'master' of https://github.com/maellestrom/movies_project

Conflicts:
	app/views/home/index.html.erb