Deleted sorter and fixed the tests. Rickard & Philip
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git