Fixed last funtion and added Nico and Alvaro's function
Merge branch 'master' of github.com:SpongeSoft/DietApp