Mercado
Merge branch 'master' of https://github.com/renanfox2/DietaV6

Conflicts:
	Dieta/MascoteViewController.m