Changes.
Merge branch 'master' of https://github.com/danieka/indavaders
We can now merge ships from several players. We also merge newly
produced ships.