curriculum and challenge names updated
fixed merge conflict