bla
intserted a new movie
laga conflict hjá mér og kris, raðaði myndunum uppá nýtt

Conflicts:
	movies.txt
Merge branch 'master' of github.com:AllGram/verkefni1
hallo
Conflicts:
	movies.txt
Merge branch 'master' of github.com:AllGram/verkefni1
heida changed
Conflicts:
	movies.txt
Merge branch 'master' of github.com:AllGram/verkefni1 into master-kris
er ad profa branches or merge
2 adam sandlers movies