Update yahtzee-246.cpp
Practicing merging pull requests.
Merge branch 'patch-1' of https://github.com/sloradio/CS246-Assignment

Conflicts:
	yahtzee-246.cpp
Merge branch 'master' of https://github.com/pwilkins05/CS246-Assignment