update of the update
Merge branch 'master' of https://github.com/connery0/ProjectChallengeRijexamen

Conflicts:
	ProjectChallengeRijexamen/DnD.Designer.cs