initial commit
Merge pull request #7 from carolguest/master

[homework, week2]