jag testar
Merge branch 'master' of https://github.com/Phredo/kvalit12test