Local commit to clean up files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	out/production/RaptorServer/com/example/RaptorServer/Globals_default.class
	src/com/example/RaptorServer/Globals_default.java
Cleaning up Globals file
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/example/RaptorServer/Globals.java
	src/com/example/RaptorServer/Globals.java.dist
	src/com/example/RaptorServer/Globals_default.java
Minor changes.