Prueba Nicolas
Prueba Nicolas

Merge branch 'master' of https://github.com/nicvel/GITR

Conflicts:
	.gitignore