Added getlocation
Added get location
Get city
Trying to merge with master
stuff
fulfill merge