week 4 work
Merge pull request #27 from andreaji/master

week 4 work