added fnished proj2 and renamed proj1