pasar toda la actualizacion

This reverts commit 43105470147d69ab83576f4f368b9e4da2d5c3aa.
Merge branch 'tester' of https://github.com/stilexmagic/foodland into tester

Conflicts:
	.DS_Store