WORKING VERSION ZOMG!!
Merge remote-tracking branch 'origin/Miguel's-Bitch'
fixed enrollment constructors
Merge remote-tracking branch 'origin/mart-branch'
Merge branch 'master' into kevin-branch

Conflicts:
	WindowsApplication3/Enrollment.vb