Minor edits and spelling changes
Merge branch 'master' of github.com:joshaw/SoftwareEngineering