Netbeans crashed on me and I lost all my files. I pulled them all back down and are pushing them back up with final changes made to the lat eight classes for both the paired and individual programming assignments.
Merge origin/master

Conflicts:
	src/crazyconnectfour/kj/BoardView.java
	src/crazyconnectfour/kj/GameBoard.java
	src/crazyconnectfour/kj/GetPlayerListView.java
	src/crazyconnectfour/kj/MainMenuView.java
	src/crazyconnectfour/kj/NewGameControl.java
	src/crazyconnectfour/kj/NewGameView.java
	src/crazyconnectfour/kj/OptionsMenuControl.java
	src/crazyconnectfour/kj/Player.java
	src/crazyconnectfour/kj/Scoreboard.java
	src/crazyconnectfour/kj/Token.java