2nd change
Merge branch 'master' of https://github.com/SBVC/Super-GPA-Product

Conflicts:
	GPA Calculator/main.cpp
Merge branch 'master' of https://github.com/SBVC/Super-GPA-Product