profun kris
Merge branch 'master' of github.com:AllGram/verkefni1

Conflicts:
	movies.txt

Merge problem