pune js
Merge http://github.com/naimath/AdsPlaces

Conflicts:
	views/city/pune.ejs