formatted list properly
curriculum and challenge names updated
fixed merge conflict
fixed bolding formatting
Merge branch 'master' of https://github.com/Devbootcamp/phase_0_unit_1