oops
Merge branch 'master' of github.com:badgerman/atlantis1

Fix broken test

Conflicts:
	atlantis.c
write reprots from console