added makefile and latexmain files
Merge remote-tracking branch 'origin/master' into hj