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