i have change cityController, homeController ,route and add additional locationController,location.ejs
Merge branch 'master' of https://github.com/aamod1990/olxDemo

Conflicts:
	api/controllers/homeController.js