test merge
Merge branch 'master' of
https://github.com/guigui177/project_traning_23_android.git

Conflicts:
	src/com/example/project_traning_23/model/Restaurant.java
commit pour doudou
Merge branch 'master' of https://github.com/guigui177/project_traning_23_android.git