Revert "almost done with merchent"

This reverts commit fce3b8a44f2c38565db1aabdbdf751c2c088bf16.

Conflicts:
	project/workspace/.metadata/.log
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Game/.indexes/48/62/history.index
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Game/.indexes/e4/be/history.index
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Game/.markers
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Game/org.eclipse.jdt.core/state.dat
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	project/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.core.prefs
	project/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	project/workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload12.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload13.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload14.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload15.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload16.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload17.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
	project/workspace/.metadata/.plugins/org.eclipse.equinox.p2.ui/dialog_settings.xml
	project/workspace/.metadata/.plugins/org.eclipse.jdt.core/669912678.index
	project/workspace/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	project/workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	project/workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	project/workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	project/workspace/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	project/workspace/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	project/workspace/Game/.classpath
	project/workspace/Game/battle/start/Fight.java
	project/workspace/Game/npc/villagers/Merchant.java
	project/workspace/Game/src/engine/Client.java
	project/workspace/Game/src/engine/Engine.java
Revert "almost done with merchent"

This reverts commit fce3b8a44f2c38565db1aabdbdf751c2c088bf16.

Conflicts:
	project/workspace/.metadata/.log
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.history/1b/c03413a2b41100131b2283813a4b255f
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.history/39/c06ebe40bd1100131b2283813a4b255f
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.history/77/a01b1030bd1100131b2283813a4b255f
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.history/a/70551c431f18001318e5f13bf53fe191
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.history/b1/c0e1f14cb51100131b2283813a4b255f
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.history/cc/10500198aa12001310f3eac32d45e3b9
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.history/d9/60f21faab51100131b2283813a4b255f
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e3/607fbd8abe1100131b2283813a4b255f
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.history/e9/60ebb1d1ac12001310f3eac32d45e3b9
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Game/.indexes/e4/be/history.index
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Game/.markers
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Game/org.eclipse.jdt.core/state.dat
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Text/.indexes/e4/be/properties.index
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	project/workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	project/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.core.prefs
	project/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	project/workspace/.metadata/.plugins/org.eclipse.debug.core/.launches/Trade.launch
	project/workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload12.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload13.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload14.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload15.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload16.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/upload17.csv
	project/workspace/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
	project/workspace/.metadata/.plugins/org.eclipse.equinox.p2.ui/dialog_settings.xml
	project/workspace/.metadata/.plugins/org.eclipse.jdt.core/669912678.index
	project/workspace/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	project/workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	project/workspace/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	project/workspace/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	project/workspace/Game/.classpath
	project/workspace/Game/npc/villagers/Merchant.java
	project/workspace/Game/src/engine/Client.java
	project/workspace/Game/src/engine/Engine.java