week 4
Merge pull request #43 from aprilkw/master

week 4