fixed some shit

Conflicts:

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