Old Map changes
Merge branch 'master' of https://github.com/cmartinezv/robber-game

Conflicts:
	game/assets/maps/map1.json
	game/assets/maps/map1.tmx
	game/assets/tilesets/tileset1.png