ultima union de las tamas
Merge branch 'python-version' of https://github.com/IgnacioBriones/desarrollo-paralelas-2014 into python-version