Baetti vid nokkrum linum i movies.txt #nais
Merge branch 'master' of github.com:Sykurpudarnir/GitExerciseInClass

Conflicts:
	movies.txt
Merge branch 'master' of github.com:Sykurpudarnir/GitExerciseInClass

Conflicts:
	movies.txt