readme edits
working on popup for city choice
padding so sliders don't overlap; added step to 2nd slider
resolved conflicts
Merge branch 'master' of https://github.com/adasilva/waterYourWallet