Removed everything
Merge branch 'master' of https://github.com/roeyb1/Science-Fair-GA

Conflicts:
	workspace/Mod/eclipse/.metadata/.log
	workspace/Mod/eclipse/.metadata/.mylyn/.tasks.xml.zip
	workspace/Mod/eclipse/.metadata/.mylyn/tasks.xml.zip
	workspace/Mod/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/org.eclipse.jdt.core/state.dat
	workspace/Mod/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/3.tree
	workspace/Mod/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace/Mod/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace/Mod/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	workspace/Mod/eclipse/.metadata/version.ini