Merge pull request #132 from buren/stora_acceptanstester

Fixed merge conflict
added some test cases
Merge branch 'master' of github.com:buren/enduro into Story18Klasser