GenericStudent klaar
Merge branch 'master'
Merge conflict opgelost.
Merge branch 'raymon'

Conflicts already solved with commit "Merge conflict opgelost. - d4e12e8c1c0a0f2cbd5ccb613c75b3c659d9ce03":

Conflicts solved:
	AD/AD.csproj
	AD/Form1.cs
	AD/Form1.Designer.cs

Code uit "AD/Form1.cs" verplaatst naar "AD/GenericStudent.cs".