Update to map and spawns
Merge branch 'master' of https://github.com/BapCraft/Maps