touchups
Merge branch 'project3' of https://github.com/mmserran/CS111_Group_Repo into project3