Haciendo commit desde gui
Merge branch 'probando' of https://github.com/dserrano3/cursoGit into probando

Conflicts:
	helloWorld.cpp
Merge branch 'probando'