added getCurrentLocation but throws null pointer Ex
got GetCurrentLocation Working
fixed conflicts