allAttractionsSaurabh
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
	pom.xml
	src/main/java/com/springapp/mvc/Controllers/DistanceBetweenAttractions.java
	src/main/java/com/springapp/mvc/Controllers/ListOfAttractionsInACity.java
attractionClassUpdate