week 5
Merge pull request #48 from aprilkw/master

week 5