Merge origin/master

Conflicts:
	CrazyConnect4/src/crazyconnect4/UserInput.java