week 3
week 3 in class work
Merge pull request #22 from andreaji/master

week 3 work