in Game, changed the interaction for creating a new game
in GameFrame, changed the interaction for creating a new game
in GameManager, changed the interaction for creating a new game
Merge remote-tracking branch 'origin/master'
Fixing the dialog for New Game to be correct
Still problems with New Game Dialog but it works just like it did a few commits ago
Connected Cells
Connected Cells
First attempt at making sure all the dialog boxes have robust functionality
Commented out more unneeded code
Commented out code
Updated the Board and Game
Modified Three Space Location
Merge branch 'master' of github.com:nwcaldwell/chokinghazard

Conflicts:
	src/models/Board.java
Merge branch 'master' into mauricio

Conflicts:
	src/controllers/GameManager.java
	src/models/Game.java
	src/models/Player.java