working
Merge branch 'master' of github.com:Petesta/geocodr

Conflicts:
	web/js/graph.js
Merge branch 'master' of github.com:Petesta/geocodr
working
Merge branch 'master' of github.com:Petesta/geocodr

Conflicts:
	web/js/graph.js
fixes
Merge branch 'master' of github.com:Petesta/geocodr