Testing core editor
Merge branch 'master' of https://github.com/markwvaughn/CISS465SpaceGame

Conflicts:
	prototype/server.exe