QA de mónica
Merge branch 'testing' of https://github.com/IgnacioBriones/desarrollo-paralelas-2014 into testing
resolver conflictos