Fixes
Merge branch 'master' of https://github.com/georgewhite5/aetherscape

Conflicts:
	src/com/github/aetherscape/Camera.java