Merge branch 'master' of https://github.com/cbernat/WebsiteTest
Otro cambio
Merge pull request #5 from InvestOp-Workers/new-feature-shared

New feature shared
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