Init
Merge branch 'master' of https://github.com/mariogarcia-ar/demo_app