Testing primer commit.
Testing
Test push
Testing of a new push
Added text to new feature
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
Merge pull request #13 from fmontenegro/master

test