breytti matrix
Merge branch 'master' of github.com:hamstur/GitExerciseInClass

Conflicts:
	movies.txt