Feature OK!

alt virker
Merge pull request #17 from snorheim/ronnieNyFeature

Feature OK!