primer commit
Merge branch 'master' of github.com:jonafrank/charla-lecciones-aprendidas

Conflicts:
	README.md