Merge pull request #1 from tgstation/master

Update
Merge pull request #2 from tgstation/master

Update
Merge branch 'master' of https://github.com/SamCroswell/-tg-station