Makefile changes
mergue
Changes for exercies requirements