agrego new feature
new feature fix
new feature fix
more fixes
more fixes 2
more fixes 3
more fixes 4
more fixes
fix on master 2
fix on master 3
fix on master 4
Agrego new feature reseteado
Merge branch 'master' of https://github.com/WEREMSOFT/GitSandbox into newFeat
Merge branch 'newFeat' of https://github.com/WEREMSOFT/GitSandbox into newFeat
Merge pull request #2 from WEREMSOFT/newFeat

Test
conflicto resuelto