Breytti ur 21 i 22
Laga conflict og baeta vid Merge branch 'master' of https://github.com/Hopurinn/GitExerciseInClass

Conflicts:
	movies.txt
nuna er eg buin ad laga allt takk og bless Merge branch 'master' of https://github.com/Hopurinn/GitExerciseInClass

Conflicts:
	movies.txt