Fixed bug with viewport coordinates.
Merge branch 'develop' of git@github.com:gsnorton/CS-547-Project-Two.git
into develop

Conflicts:
	atlantis/src/atlantis/GameStatus.java