a
Merge branch 'master' of
https://github.com/ErikDahlinghaus/ai-project1.git

Conflicts:
	src/connectn/GameState.java