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
doneandone
New hedder inserted
snilld
breitti stað sem kemur ekki conflict
Merge branch 'master-stefan'

Conflicts:
	movies.txt
Merge branch 'master-rikard'
Merging master-haftor

Merge branch 'master' of github.com:7kings/Movies
blabla
Merge branch 'master-saeli'
Merge branch 'master' of github.com:7kings/Movies
snilld
hæ
Merge branch 'master' of github.com:7kings/Movies

Conflicts:
	movies.txt
Pulling

Merge branch 'master' of github.com:7kings/Movies
Pullin#2

Merge branch 'master' of github.com:7kings/Movies
Merge branch 'master-kristjan'

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

Conflicts:
	movies.txt