new commit by aymen
new commit by aymen
Merge origin/master

Conflicts:
	DietGuideForKids/src/dietguideforkids/Pediatre.java