Made code slightly more consistent
Merge branch 'master' of github.com:mjgpy3/CyberDojoSolutions