checking things
Merge branch 'master' of https://github.com/sskates1/movie_index_2_sql

Conflicts:
	views/actors.erb
	views/movie.erb

  Merged changes