setti eitthvað bull í movies.txt
bara prufa - Ãessu má henda
Merge branch 'master' of github.com:VidTech/ExerciseInClass

Conflicts:
	movies.txt
asdflkasdfa
Merge branch 'master' of github.com:VidTech/ExerciseInClass

Conflicts:
	movies.txt
bull
Merge branch 'master' of github.com:VidTech/ExerciseInClass

Conflicts:
	movies.txt