kolla fokkar ollu upp
Merge branch 'master' of https://github.com/Skvizurnar/skvizurnar

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

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

Conflicts:
	movies.txt