Merge origin/master

Conflicts:
	connectFour/GameProject.java
Merge origin/master

Conflicts:
	connectFour/GameProject.java