tr
f
Merge branch 'master' of https://github.com/JelleBosmans/PenO_CWA1

Conflicts:
	Versie 1.0/Class_Trophies.pyc