Actualizar mi logt y task
Merge branch 'master' of https://github.com/jw92/PPR
Resolver conflict