Merge branch 'master' of https://github.com/dilkuwor/Student-Grading-System

Conflicts:
	GPA/GPA/Models/GPADataModel.edmx
Merge branch 'master' of https://github.com/dilkuwor/Student-Grading-System

Conflicts:
	GPA/GPA/Models/GPADataModel.Designer.cs
	GPA/GPA/Models/GPADataModel.edmx