Merge origin/master

Conflicts:
	connectFour/GameProject.java
	connectFour/entity/GuiPlayer.java