Added makefile, and expanded template.
Finalised Makefile.