Merge branch 'GraderSpec' into GraderSpecMatt
Merge branch 'GraderSpec' into GraderSpecMatt
getters and setters, member vars name change
Merge branch 'GraderSpecMatt' into GraderSpec