Verder gewerkt
Merge branch 'master' of https://github.com/KDercksen/compot

Conflicts:
	poster/main.pdf