struct initialization warning, gcc
Merge branch 'master' of github.com:badgerman/atlantis

Conflicts:
	atlantis.c