progress on d3 colocation chart. added transitions and nodes/links dont move
update client with folder files. updating collocation chart file to take in data from server
Merge branch 'master' of https://github.com/noahcharris/Newspeak

Conflicts:
	server/public/client/charts/collocationChart.js
	server/public/client/controllers.js
	server/routes.js
Merge pull request #6 from cooperjbrandon/master

merge