Test Esteban
FratureA
Test Esteban 1
Fix in FeatureA
Finish FeatureA
Merge branch 'featureA'
Test Another Change
Merge branch 'test-esteban'
Merge pull request #3 from ggastaldo/master

Approved!
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from InvestOp-Workers/master

Test Pull Request
New Feature
Otro cambio
Merge pull request #5 from InvestOp-Workers/new-feature-shared

New feature shared
Merge branch 'master' of https://github.com/Html5Player/WebsiteTest
confict test