multi-hex movement can still not be tested
Merge branch 'master' of github.com:badgerman/atlantis

Conflicts:
	lib/atlantis.test.c