initial commit
Merge https://github.com/tylercbreton/demo_app