Merge pull request #1 from jzanutto/frontend

Frontend
rolling back local database
resolving database conflicts
Merge branch 'master' of github.com:jzanutto/TO-coop-housing

Conflicts:
	.gitignore
fixed up map controller, moved haversine function to external class/module
refactored app.js
fixed company not found when merging
removed db yml from git tracking