Test kusi
Merge origin/master

Conflicts:
	ConnectFour/src/connectfour/Test.java