up
Merge branch 'master' of https://github.com/Apakettir/Verkefni1

Conflicts:
	movies.txt