Finish demo app
Finish app
Merge branch 'master' of https://github.com/ggrey/demo_app