Adding documentation; merging old/new makefile.