Testing primer commit.
Testing
Content
Test push
Merge branch 'master' of https://github.com/cbernat/WebsiteTest
lalalala
Testing of a new push
Nuevo cambio input
Merge branch 'ceci-task_master'
Otro cambio
Merge remote-tracking branch 'esteban-repo/new-feature-shared'
Merge pull request #5 from InvestOp-Workers/new-feature-shared

New feature shared
Added new changes
Cambio con conflicto.
Merge branch 'master' of https://github.com/Html5Player/WebsiteTest
confict test
Merge pull request #8 from InvestOp-Workers/master

Conflicto con Sherman
confict test2
Merge pull request #9 from gdosreis/master

resolve conflict
Merge remote-tracking branch 'upstream/master'

Conflicts:
	NewFeature.txt