curriculum and challenge names updated
fixed merge conflict
fixed bolding formatting
Merge remote-tracking branch 'upstream/master'