loading local d3 lib
Merge branch 'master' of github.com:JoshuaDickerson/hackvt-2014

Conflicts:
	maptest.html
Fixed merge conflict
Merge branch 'master' of github.com:JoshuaDickerson/hackvt-2014

Conflicts:
	maptest.html