Finish demo app
Merge pull request #2 from Scott1743/develop

Finish demo app