Exercise 4 completed. New makefile format.
Fixing merge conflicts in makefile.
Fixing conflicts in makefile.