Merge pull request #1 from anderballer/FuncDieta

Func dieta
Merge remote-tracking branch 'origin/master' into FuncDieta