Merge branch 'John's-Edits'
Merge branch 'master' of https://github.com/jhatnguyen/OOSD---Team-5