baetti vid frozen, besta mynd ever takk.
lagadi conflict og baetti vid frozen
Merge branch 'master' of https://github.com/Hopurinn/GitExerciseInClass

Conflicts:
	movies.txt
lagadi conflict
Merge branch 'master' of https://github.com/Hopurinn/GitExerciseInClass

Conflicts:
	movies.txt