Finish demo app

Completed the Demo App from Chapter 2