Merge branch 'master' of /Users/Lewis_2014/PycharmProjects/CSC148H1-Assignment-1 with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of /Users/Lewis_2014/PycharmProjects/CSC148H1-Assignment-1 with conflicts.
Edited student.py