Merging changes; Quiz is still not functional. Looking into CSRF issues