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
Revert d6a2078..2103fd4

This rolls back to commit d6a207824c48be6e040df2e7be2217bcc61f8a6c.
Font change
Merge branch 'master' of https://github.com/cmartinezv/robber-game

Conflicts:
	src/js/states/endgame.js