Fixed makefile Implemented task 3.1