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