hænumynd
nú fer allt til fjandans
Merge branch 'master-stefand12'

Conflicts:
	movies.txt
Merge branch 'master' of github.com:HIGGEES/fluguskitur