load by parsing xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Made pdflatex to do whaat we want
Merge remote-tracking branch 'origin/master'