Merge pull request #2 from bancTemps/oscarB

Merg mster y oscarB