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