Ship Generation

Needs more combinations since it doesn't seem to be random enough.
Trying to get this things to shut up
Trying to commit and resolve conflicts

Has ship generation in it
Fixing push

3 unresolved commits that can't be disregarded.