Fixed miscellaneous issues

-Added makefile
-updated method declaration
-fixed a number of include statements
Just wrap each line after the .cpp by adding a `\` just before the newline character.