Entrega8#60

jzeaherra wants to merge 3 commits intoging:masterging/planet2012:masterfrom

jzeaherra:entrega8jzeaherra/planet2012:entrega8Copy head branch name to clipboard