prueba
Merge pull request #6 from fcostazini/master

Cambio de tipo de prop a String
Merge remote-tracking branch 'remotes/Servidor/master'

Conflicts:
	TestGit/Class1.cs
Merge pull request #7 from dariocamarro/master

prueba
Merge remote-tracking branch 'remotes/MainRepo/master'

Conflicts:
	TestGit/Class1.cs