primer commit
Merge branch 'master' of github.com:oaky87/sample_app

xq me equivoque antes