Merge pull request #1288 from ariannedee/master

Fix for Issue-100: Refactor the code for calculating a student's average mark