PHIT Begin
Merge branch 'master' of https://github.com/fabiogermann/zhaw-zufa

Conflicts:
	CDT/cdt.pdf