play with yourself
Merge remote-tracking branch 'origin/sprint2-network' into gui-sprint2
Better 'inactive' effect
Added automatically generated UML Class Diagram. Created with ObjectAid UML Explorer plugin, can be installed from update site http://www.objectaid.net/update
Untangled class diagram
Fixed Fränzis test-only code I 'accidentally' merged into my branch
Added Battleship MS Project files
Reversed change to default boardSize in GameRule
Implemented rollback if moveShip() is invalid.
Also improved JavaDoc for GenericShip