Merge pull request #4 from ZomgPonies/master

Ponies  -> Local Branch
Merge pull request #5 from ZomgPonies/master

Update
Kamikaze fix / Admin room upgrade
Abandoned Cargo Station Update
Merge pull request #102 from SamCroswell/master

Admin Room Upgrade, Kamikaze Fix