-Could not pull changes made in repository cdavis17
-Copied and pasted new classes from cdavis17's github repositories