Added Elmar's new comments
Merge branch 'master' of https://github.com/gfokkema/TI1805

Conflicts:
	TP3/src/4257286-4334051.h