testing the find location button
Styling the app
fixed merge conflicts