bætti á listann
Merge branch 'master' of https://github.com/TeamOrvar/DasGit

Conflicts:
	movies.txt