Merge conflicts resolved.
Merge branch 'master' of https://github.com/kevcmk/cse118team2