Random
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/SpaceCraft
1.0/.indexes/e4/28/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SpaceCraft
1.0/.indexes/e4/4d/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SpaceCraft
1.0/.indexes/e4/97/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SpaceCraft
1.0/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/SpaceCraft
1.0/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/4179504739.index