Entrega 6#31

albertomd wants to merge 2 commits intoging:masterging/planet2012:masterfrom

albertomd:masteralbertomd/planet2012:masterCopy head branch name to clipboard