finish demo app
Merge branch 'master' of https://github.com/missmaggiemo/demo_app

'merge because I messed something up'