ronald
Merge branch 'master' of https://github.com/julioh/CursoaslBarquisimeto
Merge branch 'master' of https://github.com/julioh/CursoaslBarquisimeto
ronald caruci
Merge branch 'master' of https://github.com/julioh/CursoaslBarquisimeto

Conflicts:
	README.md
ronald caruci
rdcaruci@gmil.com
Merge branch 'master' of https://github.com/julioh/CursoaslBarquisimeto