Merge Macsdickinson - create and edit quiz