Initial commit
Finish demo app
Merge branch 'master' of github.com:stollefson/demo_app