breitti stað sem kemur ekki conflict
Merge branch 'master-kristjan'

Conflicts:
	movies.txt
dsvojnMerge branch 'master' of github.com:7kings/Movies

Conflicts:
	movies.txt
sodnMerge branch 'master' of github.com:7kings/Movies