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

Conflicts:
	atlantis.c
Merge branch 'master' of github.com:badgerman/atlantis1
msvc warnings fixed