Merge remote-tracking branch 'upstream/master'
Divers corrections
Je sais plus ce que j'ai fait depuis taleur :D
Correction du getJ()
Redimension des tuiles
Redimension de l'écran (non terminé)
Bug : Conversion x,y en i,j
Redimension terminée + conversion x,y en i,j corrigée
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web2/TileView.java
début de réflexion sur les classes monstres et chemin
Merge remote-tracking branch 'upstream/master' into monstre

Conflicts:
	src/net/web2/Monstre.java
	src/net/web2/TileView.java
Merge branch 'master' of https://github.com/picartnicolassrc1a2/Web2
Merge pull request #29 from FrancoisGazet/monstre

Monstre
Merge remote-tracking branch 'upstream/master'

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

Conflicts:
	src/net/web2/TileView.java
Merge effectué + Suppression variables inutiles
Merge pull request #28 from Stelarius/master

Quelques corrections
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web2/TileView.java