# WARNING: head commit changed in the meantime

Merge branch 'master' of https://github.com/mhweaver/cs471-nmm.git

Conflicts:
	src/Board.java
	src/NineMensMorris.java
	src/Node.java