Finish Chapter 2

finish chapter 2 demo_app