week 5 work
Merge pull request #33 from andreaji/master

week 5 work