TZ
Merge branch 'master' of github.com:spickajan/bayesian_kriging

Conflicts:
	TZ/TZ.tex