bÃaetti vid hehe i okin
lagadi nokkrar linur
Merge branch 'master-karitas'

Conflicts:
	movies.txt