Proj2 all working

All required functions are working!!