empty
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
Changement chaine dans vue Preview