Merge origin/master

Conflicts:
	crazyConnectFour/src/crazyconnectfour/Game.java