resolve merge conflits
setting up force graph d3
Merge branch 'gh-pages' of https://github.com/lithiah/WheatonConnections into gh-pages

Conflicts:
	connections.json
	connectionvisualize.html