Added in all of the other guys work
Merge branch 'master' of https://github.com/jjfazio/308Grader