Made Changes to the Testing Page
Merge remote-tracking branch 'origin/master'

Conflicts:
	musicTeacher/musicTeacher/forms/FormTrainingPage.cs
	musicTeacher/musicTeacher/forms/FormTrainingPage.resx