Merge pull request #1 from mikeizbicki/cs100-2014fall

Got up to date files
enrolling in cs100
Merge pull request #198 from Liniarc/cs100-2014fall

enrolling in cs100