Merge branch 'refs/heads/master' into dev-branding
Spring Semester Color Blocks

Updated to reflect new course IDs

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-branding'