Sync
Merge branch 'master' of https://github.com/trevorsargent/CS2

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/CS2/.markers

.metadata/.plugins/org.eclipse.core.resources/.projects/CS2/org.eclipse.
jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi