added a js function to get the user's city automatically
Merge branch 'master' of https://github.com/drobin03/wisp