Sódóma Reykjavík er awesome
Merge branch 'master' of github.com:AustanJotnar/GitExerciseInClass

Conflicts:
	movies.txt