Did ex5 and ex6, and updated Makefile