up
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web2/Wave.java
Suppressions monstres morts (pierre/julien)
Suppression des monstres morts
Merge pull request #56 from julienclabaut/master

Vie des monstres
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/net/web2/TileView.java