Corrigiendo CR
Moviendo checkbox
Merge pull request #69 from GangOfFive/crearFormula

Crear formula
Arraglando conflictos
Mergeando master