everything workings except order to results
Merge branch 'master' of https://github.com/haroldtreen/Solomon
nooo more merge conflitcts!