commit victor
conflict fix
Merge branch 'master' of github.com:ipascual/talostest