Finish demo app
Merge branch 'master' of https://github.com/Tony-Gagliardi/demo_app