Solucionando conflicto
Merge https://github.com/lfmexi/HealtyFood

Conflicts:
	gen/edu/tesis/healthyfood/R.java
Eliminación de basura