New version of TeX file
Solved conflicts
Added *.out to gitignore