ex3
exx3
Merge branch 'master' of https://github.com/lampe142/unit_1

Conflicts:
	document.pdf
	document.tex