add gradequiz page
resolve merge conflict