week 1 in progress
Merge pull request #2 from andreaji/master

week 1 in progress