Skellti inn einni linu i vidbot
Baetti vid nyrri linu
Merge branch 'master' of github.com:Sykurpudarnir/GitExerciseInClass

Conflicts:
	movies.txt
Merge branch 'master' of github.com:Sykurpudarnir/GitExerciseInClass

Conflicts:
	movies.txt