breyta línu 1
x
Merge branch 'master' of github.com:Skvizurnar/skvizurnar

Conflicts:
	movies.txt
Merge branch 'master' of github.com:Skvizurnar/skvizurnar

Conflicts:
	movies.txt
Merge branch 'master' of github.com:Skvizurnar/skvizurnar

Conflicts:
	movies.txt