Updaterat framsidan (index.ejs)
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/pages/movie.ejs