vignir dskfmsdf
spiderman
Merge branch 'master' of https://github.com/Skilnadarbornin/GitExerciseInClass

Conflicts:
	movies.txt