Interfaces e classes communs entre os dois projetos ficam aqui
ja chega por hoje amanha ha mais criei a estrutura do nosso projeto
commit
teste
funciona
vamos ver
ve se funca
Merge branch 'teste'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/5e/60ac0a38a16a001412ce9943b4c4074b
	.metadata/.plugins/org.eclipse.core.resources/.history/90/9004c977106600141ec9c4e6b50a9198
	.metadata/.plugins/org.eclipse.core.resources/.history/cb/4041c877106600141ec9c4e6b50a9198
	.metadata/.plugins/org.eclipse.core.resources/.history/dc/f0000e357c6400141d9fd8e7d43d2887
	.metadata/.plugins/org.eclipse.core.resources/.projects/ClientWebsite/.indexes/5b/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ClientWebsite/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/ClientWebsite/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/ClientWebsite/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/VMall/.indexes/7/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/VMall/.indexes/e4/54/8a/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/VMall/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/VMall/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/VMall/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/VMall/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.debug.core/.launches/apache-tomcat-8.0.14 at localhost.launch
	.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1565262852.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.jsdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.wst.server.core/publish/publish0.dat
	.metadata/.plugins/org.eclipse.wst.server.core/tmp0/conf/server.xml
	.metadata/.plugins/org.eclipse.wst.server.core/tmp0/work/Catalina/localhost/ClientWebsite/org/apache/jsp/Index_jsp.class
	.metadata/.plugins/org.eclipse.wst.server.core/tmp0/work/Catalina/localhost/ClientWebsite/org/apache/jsp/Index_jsp.java
	.metadata/version.ini
	VMall/bin/.gitignore
	VMall/bin/servidor/vmall/Servidor.class