Small changes to grammar and conventions
Merge branch 'master' of https://github.com/CDSteer/cs235group3a5