fixed merge conflicts for real
Merge branch 'master' of https://github.com/haroldtreen/Solomon
merge conflicts again