Commit before merge
Merge branch 'master' of https://github.com/dawguy/CS2340MULE

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/MuleGame-desktop/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/MuleGame/.indexes/e4/87/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MuleGame/.indexes/e4/a6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MuleGame/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/MuleGame/org.eclipse.jdt.core/state.dat
	.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/993003486.index
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
Testing the merge