Project 6 grading#123

ProfJanetDavis wants to merge 2 commits intomasterWhitmanSWDesignSpring2018/project-5-8-teamalpha:masterfrom

project-6-gradingWhitmanSWDesignSpring2018/project-5-8-teamalpha:project-6-gradingCopy head branch name to clipboard