Week 12 Quiz Re-write
Merge remote-tracking branch 'origin/master'

Conflicts:
	Week12/Quiz/Quiz3/Dice.java