commit empty
Merge branch 'master' of https://github.com/guithieb/PFE1320.git

Conflicts:
	zAppv1/bin/classes.dex
	zAppv1/bin/resources.ap_
	zAppv1/bin/zAppv1.apk
Merge branch 'master' of https://github.com/guithieb/PFE1320.git

Conflicts:
	zAppv1/src/com/example/zappv1/Preview.java
Merge branch 'master' of https://github.com/guithieb/PFE1320.git

Conflicts:
	zAppv1/src/com/example/zappv1/Preview.java
empty
début affichage liste chaines (images et description)
empty
Merge branch 'master' of https://github.com/guithieb/PFE1320.git

empty
Merge branch 'master' of https://github.com/guithieb/PFE1320.git

empty
Merge branch 'master' of https://github.com/guithieb/PFE1320.git
empty
affichage nom du programme dans preview.java & .xml

amélioration du design de chaineview.xml et liste_chaine.xml