Revert "Revert "Final-School-Project""

This reverts commit aff7c239fb6b02cbd1fd8d21a183ecb45307edbd.