Changed order of checks closer to natural language.
Merge branch 'master' of github.com:stoft/exercisms
Passes tests.