eg gerdi thetta ekki
Merge branch 'master' of github.com:VidTech/ExerciseInClass

Conflicts:
	movies.txt