Quiz update!

Yey!
quiz update
Merge remote-tracking branch 'origin/duggasys-Quiz' into duggasys-master