spelling changes
Merge branch 'master' of https://github.com/haroldtreen/Solomon
mergingaaa
Merge branch 'master' of https://github.com/haroldtreen/Solomon
merge conflicsts