moved current location button
fixed merge conflict
Merge pull request #107 from LightningLord/moved_current_location_button

Moved current location button