Added final project
Merging upstream changes with local