Initial commit
Merge https://github.com/ricardo-monge/demo_app