Merge branch 'evaluation' into Parker
committing fixes to game
fixing some scaling issues

TODO: look up planet loading bug
saving potentially diffs
Merge branch 'Parker' into Marques-Stone