Final version of the project

This version includes the two parts of the project.