bd
hrthrtg
caonima
l
ok
qdzsqdcqszdcfaqzscfqzsacfd
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	res/layout/commentaire.xml
	src/com/example/zoo/BD.java
	src/com/example/zoo/CommentaireAdapter.java
	src/com/example/zoo/Commenter.java
	src/com/example/zoo/List.java