Merging Final Project

Merging final project