fixing database conflicts...again
fixing more merge conflicts
moved haversine out of assets folder
moving around files more
fixed map_controller to properly handle distances
typos, typos everywhere
fixed merge conflicts and added credit for inline haversine function
finished this bitch