gestion ecran
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web2/TileView.java
rectification redimensionnement ecran
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web2/TileView.java
redimensionnement ecran
Merge pull request #9 from BauduinSamuel1A1/master

redimensionnement ecran
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web2/TileView.java