Bætti við nri mynd :)
Merge branch 'master' of https://github.com/MinionsHugb/GitExerciseInClass

Conflicts:
	movies.txt