Unas cuantas cosas
agregado el botón shortcut
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/tesis/healthyfood/ConsumoDiario.java
	src/edu/tesis/healthyfood/Perfil.java