Merge origin/master

Conflicts:
	src/connect4Frames/BoardFrame.java
	src/connect4Frames/EnterPlayerNames.java
	src/connect4Frames/MainFrame.java
Merge origin/master

Conflicts:
	src/connect4Frames/BoardFrame.java
	src/connect4Frames/EnterPlayerNames.java
	src/connect4Frames/MainFrame.java