Modified so intro is a bit cleaner than before
Merge branch 'master' of https://github.com/Moergil/SpaceStation
Finished for today :)
Merge branch 'master' of https://github.com/Moergil/SpaceStation