Merge branch 'master', remote-tracking branch 'origin' into gh-pages
Added labels for sets in function exercises, floating of diagrams to right, and CS40_W13_IC15
Merge branch 'gh-pages', remote-tracking branch 'origin'