deleted:    config/.gitignore, modified:   maps/tgstation2.dmm
Merge branch 'master' of https://github.com/HeavensGate/NSS-Eternal