Fixed miscellaneous issues

-Added makefile
-updated method declaration
-fixed a number of include statements
Please use v2.6 of the template makefile.