First two exercises complete.
Adding ex1 and ex3.
Fixing merge conflicts in makefile.