Experiment with #pragma marks and TODO comments
Group together the 2011 Fall course code
Merge branch '2011-fall'

* 2011-fall:
  Group together the 2011 Fall course code
Make room for the 2013 Winter course
Merge branch '2013-winter'

* 2013-winter:
  Make room for the 2013 Winter course