aaa
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web2/TileView.java
TileView.java : methode ciblage = recuperation de la distance entre la
tour et les monstres.

Tour.java : Définition de la cible.
Merge remote-tracking branch 'upstream/master'
Définition de la cible et réinitialisation de la cible.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/web2/TileView.java
Ajout de la methode ciblage
Merge remote-tracking branch 'upstream/master'

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

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

ciblage (avec Nicolas)