Quiz Update
Merge branch 'duggasys-Quiz' into duggasys-master