Project 7 grading#109

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

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