remove commented lines that were junk
commented code
adding tex
merge conflicts, hopefully last commit