fix
Merge branch 'master' of https://github.com/maribelCS/gradesDataIntegration

Conflicts:
	GradebookUI.cpp