trying to work out bug issues
Merge origin/master

Conflicts:
	src/crazyconnectfour/kj/FourConnectingTokenCheck.java
	src/crazyconnectfour/kj/Token.java