edits 80s movies
fixes merge conflicts

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