CS100 enrolled
Merge pull request #193 from emullally/cs100-2014fall

CS100 enrolled