Pour merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web1/Web1Activity.java
Affichage de la question
Merge pull request #10 from ReantMickaelSRC1a2/master

Affichage question