Testing primer commit.
Testing
Test push
Testing of a new push
Added text to new feature
Merge pull request #11 from smurgolo/master

agregado nuevos cambios para probar conflictos
Testing
Testing
Testing push
readme modif
Merge remote-tracking branch 'gato/dev1'

Conflicts:
	README.md
Merge remote-tracking branch 'gato/dev1'

Conflicts:
	README.md
Merge pull request #1 from fmontenegro/DEV1

Dev1
Merge pull request #3 from cbernat/master

dsffdafsdf
nuevo cambio
Merge pull request #13 from fmontenegro/master

test
fantastico metodo nuevo
rm
Merge pull request #14 from gdosreis/master

rm LoginPage
Merge pull request #15 from cbernat/master

Otro cambio