breytingar
Merge branch 'master-hallgrimurt13'
breytingar
Merge branch 'master' of https://github.com/ANewHope/GitExerciseInClass
breytingar

Conflicts:
	movies.txt
Merge branch 'master' of https://github.com/ANewHope/GitExerciseInClass
f