-débug
adjust
Merge branch 'master' of https://github.com/debflav/mars

Conflicts:
	MapGenerator/Block.php
	MapGenerator/Tile.php