Finished project

This is the final version of the group project