Pulling Changes from Main Repository

Pulling the updated current version of our project to my local machine to contribute