endring 5
Merge pull request #11 from RonnyWathne/master

endring 5