Merge branch 'staging' of /Users/brian/code/code-dot-org with conflicts.
Add msm-new curriculum boilerplate