Fix numbering
Reorganize features
Merge branch 'master' of github.com:JumpstartLab/curriculum