merge request

complete challenge model