finish demo app
Merge branch 'master' of https://github.com/davidHdw/demo_app