fixed merge conflicts
updated git ignore
more conflicts ahhhhh
got location data