Merge of major changes

I think we have a fully functional battleships server.