Kevin's changes part 1
Merge branch 'master' of https://github.com/niode/cpsc433