Finishing demo app
Merge branch 'master' of https://github.com/adiagarwalla/demo_app