agregado archivo p.txt
Merge branch 'origin/dev' into dev

Conflicts:
	letras/p.txt

mendoza equipo D
se agrego el archivo Y
corregimos y.txt
Merge branch 'dev' of http://github.com/isagulo/glcap into dev
Merge branch 'dev' of https://github.com/isagulo/glcap into dev
Merge branch 'dev' of https://github.com/isagulo/glcap into dev
mendoza
Merge branch 'dev' of http://github.com/isagulo/glcap into dev
Merge branch 'dev' of https://github.com/isagulo/glcap into dev
a
Merge branch 'dev' of https://github.com/isagulo/glcap into dev
Te ganamos
agrego 8
Merge remote-tracking branch 'origin/dev' into dev
Merge branch 'dev' into release