updated final files from proj1 (sol)