Corrected "bugfix" to "master" under merge conflict section of README
Merge branch 'grades' of https://github.com/bridgetbennecke/ucr-cs100 into grades
graded assignment using automatic scripts