week 3

Cool stuff
Merge pull request #24 from fredoak/master

week 3