Merge.
Finalized project 3 files