breitti þessari mynd
Merge branch 'master' of github.com:7kings/Movies
breitti conflict
Conflicts:
	movies.txt
Merge branch 'master' of github.com:7kings/Movies
bla
Conflicts:
	movies.txt
Merge branch 'master' of github.com:7kings/Movies
stebbi lord
Conflicts:
	movies.txt