define grade_to_gpa() function, modify some errors in test_exercise1
Merge remote-tracking branch 'origin/master'

Conflicts:
	exercise3.py