Merge pull request #2 from ParadiseSS13/master

Merge From Master
Map Changes
Merge pull request #4 from Fox-McCloud/Map-Tweaks

Map tweaks