Renaming Conventions
Merge branch 'master' of https://github.com/khshah3/CS-425---MP1