Merge pull request #39 from Stelarius/master

GROS COMMIT
Merge pull request #47 from Stelarius/master

Ajouts des points de vie et de l'argent
ajout de Tour.java
Merge branch 'tours' of https://github.com/FrancoisGazet/Web2 into tours

Conflicts:
	src/net/web2/TileView.java
Merge pull request #48 from FrancoisGazet/tours

ajout de Tour.java
Merge remote-tracking branch 'upstream/master'