added latexmain file, slight update to Latex Makefile
fix merge conflict in description.tex