clase del 25/09/2014
Merge branch 'master' of https://github.com/Luis07/progra_1_lll_cuatri_2014_Luis_Brenes