Commit
Depois de adicionar algumas dependencias de Spring, os POJOS iniciais
incluindo seus DAOS e Servicos
Merge commit '99252dc6ea38b58859a01d8a5d043a38e921b361'

Conflicts:
	CartaoVisita/.classpath
	CartaoVisita/.settings/org.eclipse.wst.common.component
	CartaoVisita/WebContent/WEB-INF/web.xml
	CartaoVisita/pom.xml
	CartaoVisita/resources/struts.xml
	
Tentando resolver conflitos
Merge branch 'master' of https://github.com/pctjose/CartaoVisita.git