Eg baetti vid matrix2
Merge https://github.com/Skilnadarbornin/GitExerciseInClass
eg reyndi ad senda inn aftur med matrix2
Conflicts:
	movies.txt
Merge https://github.com/Skilnadarbornin/GitExerciseInClass
eg baetti vid john travolta myndinni
Merge https://github.com/Skilnadarbornin/GitExerciseInClass

Conflicts:
	movies.txt