Merge branch 'master' of https://github.com/YANS2014/pytex

Conflicts:
	README.md
	reports.tex
Merge branch 'master' of https://github.com/YANS2014/pytex

Conflicts:
	README.md