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

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

prueba