Updated Quiz.java... I haz some logic issuezzz

Merged branch... (Btw ddarkpolice have you read how to merge branch alr?)