Error Commit

Forgot to commit. Let's see how this plays out... xD
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log

	.metadata/.plugins/org.eclipse.core.resources/.history/88/d048820fda5300141304e9ea556c3ca8

	.metadata/.plugins/org.eclipse.core.resources/.projects/MCSmash/.indexes/e4/98/a2/63/6/1f/3e/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MCSmash/.indexes/e4/98/a2/63/6/1f/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MCSmash/.indexes/e4/98/a2/63/6/87/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/MCSmash/.indexes/e4/98/a2/63/6/history.index

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

	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/version.ini