bla
nu er gaman
þetta er comment
Merge branch 'master' into newbranch

Conflicts:
	README.md