blahblah
2 must see movies!
Merge branch 'master' of github.com:AllGram/verkefni1

Conflicts:
	movies.txt

I fixed a conflict between pull from heida's recent update and mine