refactored app.js
fixed company not found when merging
removed db yml from git tracking
fixed merge conflicts and added credit for inline haversine function
finished this bitch
Merge remote-tracking branch 'origin/master' into frontend
added infowindow with company name and address for company marker
fixed merge conflicts with master