première suppression
autre modif
by pass du mdp
Merge remote-tracking branch 'origin/branche_merge_corrige'

Conflicts:
	restaurantApp/src/com/example/restaurantapp/Plat.java