affichage
affichage
Merge branch 'master' of https://github.com/khalidafla/GitTest.git

Conflicts:
	GitTest/src/com/exemple/gittest/Main.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	GitTest/src/com/exemple/gittest/Main.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	GitTest/src/com/exemple/gittest/Main.java