Revert "lo e arreglao"

This reverts commit 9de4eb1414f11b12a4f76924555f5c360c18bbc0.
Revert "Revert "lo e arreglao""

This reverts commit 504d7dd5897874d38b055c04f3b68dbf29eb45a9.
Revert "Revert "Revert "lo e arreglao"""

This reverts commit 82270429b21840fd684b5f6adc4d44ad06a2a268.
Revert 8227042..f00c9f4

This rolls back to commit 82270429b21840fd684b5f6adc4d44ad06a2a268.
FIcheros a ignorar
Merge branch 'master' of https://github.com/nroje/Pr1