Did I Recalculate my GPA correctly?