week one in progress
Merge pull request #3 from fredoak/master

week one in progress