Feature 001

compared osalinas/develop vs osvaldo-mx/Feature-001 branches