Tareas de m�dulos 1 y 2
Tarea 3.1 del m�dulo 3
Merge branch 'master' of https://github.com/carlosbello/firefox-os_miriadax