eureka properties
Merge branch 'solved'

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