Finish chap 10
Merge branch 'master' of https://github.com/ilovearsenal93/sample_app