Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleedingedgefreeze
(respectfully) removing a 1MB jpg of /tg/'s future map plans from the repository. Replaced with a text link to an imgur mirror.
Re-adding a classic.
Merge pull request #3 from Baystation12/bleeding-edge-freeze

Bleeding edge freeze
Merge pull request #2161 from Asanadas/bleeding-edge-freeze

Misc: Removing jpg, adding space_asshole.ogg