Update maps/conference_room.tmx

Warp update.
Update maps/conference_room.tmx

Warp update.
Update maps/chishiki_no_sabaku.tmx

Warp update.
Merge pull request #1 from PyroSamurai/patch-1

Patch 1
Update maps/chishiki_no_sabaku.tmx

Warp update
Merge pull request #13 from PyroSamurai/master

Map Update