Final version

Final version of project 1