server name as atom
Merge branch 'server' of github.com:forestbelton/spaceshit into server