Merge origin/master

Conflicts:
	src/connect/four/ConnectFour.java