Game to end once player disconnects
Notify clients of all game-over conditions
Enemies to no longer die from collisions
closing server frame to exit application
Enter key to submit grid generate/load dialogs
Disable client buttons until server is created
Merge remote-tracking branch 'origin/dev' into #106-milestone-prep
fix bomb detonation concurreny issue
enemies to not collide with each other
Move Launcher to common package
Add "End game" button to server view
Merge pull request #114 from oharaandrew314/#106-milestone-prep

Right. Merged then.
UML for Milestone 2

The Subsystem diagram is bigger now…
Merge branch 'dev' into Improve-testDriver

Conflicts:
	src/client/controllers/TestRunner.java
Event and Network Diagram updates

Somehow managed to miss the Event diagram the first time around…attempt
2.
Merge pull request #117 from oharaandrew314/UML-Milestone-2

UML for Milestone 2
fixed merge conflict
Merge branch 'dev' into Improve-testDriver