images added to latex files
merge conflicts on latex files fixed