Week3 and modification of Week2
Merge branch 'progfun-003' of github.com:huajianmao/learning into progfun-003