SKrivit om i readme
Merge conflict resolved