Render test map data
Rendering new tileset
Merge res
Fixing bad ref to tilemap.map
Merge res again