Mercado
Merge branch 'master' of https://github.com/carlosapsjunior/DietaV2

Conflicts:
	Dieta.xcodeproj/project.pbxproj
	Dieta/PratoViewController.h