Finished task 3. Modified makefile accordingly