eliminar solucion
Merge branch 'master' of github.com:scmspain-segundamano/techConf2014_microservices

Conflicts:
	microserviceA_Solution/src/main/resources/eureka-client.properties