Merge branch 'grades' of https://github.com/ChemicalWonders/ucr-cs100 into grades