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

Update