Merge pull request #2 from jimwhitfield/master

reorg + week 3