added order
fixed merge conflicts i hope
Merge branch 'master' of https://github.com/haroldtreen/Solomon
mergeeee conlfixsts