Finish chapter11 homework
Merge branch 'master' of https://github.com/lanxi/sample_app_6