Onload calculation of new GPA and number of fails
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/students/show.html.erb