condicionales y while
Merge origin/master_branch_1 into master_branch_1