prueba de resolucion de confictos
Merge branch 'master' of github.com:jnavero/IoCSpringExample

Conflicts:
	README.md