Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Appel de initTileView()
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web2/TileView.java
Suppression doublons
rien
Merge pull request #16 from Stelarius/master

Debug : Initialisation de mTileSize dans la méthode init
Merge pull request #23 from FrancoisGazet/master

Débuggage de l'ajout/suppression de tour
Herbe affichée correctement
Merge remote-tracking branch 'upstream/debug'

Conflicts:
	src/net/web2/TileView.java
fixed #17
Merge pull request #24 from Simishy/master

onDraw herbe
commit conflit
Changement de tour + tour 2
Fix #3
Merge pull request #25 from GosseyeCecile1A1/master

Changement image
fixe du bug 22 de l'intervertion de X et Y
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web2/TileView.java
	
fixed #22
fixed #21
corrigé bug affichage herbe
Merge pull request #27 from julienclabaut/master

correction bug affichage herbe