Merged the latex files, edited all sections