Added one more comment to the GameplayView.java class. This is to test
how branches are allowed to be different from the master, and how that
is changed on the GitHub website.
Made alert dialog box for new game button
3x3,4x4,5x5 now accessible
Code changed: GameplayView.java: Added lines 256-280, 286-312, changed
parameters on lines 285
[1] OnGameOverListener and OnMarkerPlacedListener consolidated with
	GameStateListener.
[2] Changed how the constructors of the Marker class work. They no
	longer call Player.setMarker when given a Player as an argument.
test
Merge branch 'develop' into jack

Conflicts:
	T3/src/edu/uco/sdd/t3/gameboard/GameplayView.java
Merge branch 'develop' into heru

Conflicts:
	T3/src/edu/uco/sdd/t3/gameboard/Board.java
fixing changes between develop and heru branch