on update working
Merge branch 'visualizationLayouts' of https://github.com/shilad/macademia into interactiveVisualization

Conflicts:
	Macademia/application.properties
new root transition is working
small tweaks
small tweaks
Merge branches 'interactiveVisualization' and 'visualization' of https://github.com/shilad/macademia into interactiveVisualization
incorporated new data model
incorporated new data model
working on fixing the issues with the sizing of hubroots
fixed vizRoot to be a set class
fixed transitions!

but noticed that people don't show up at all
fixed transitions!

but noticed that people don't show up at all
Creating array for createPeople()
Merge remote-tracking branch 'origin/interactiveVisualization' into interactiveVisualization

Conflicts:
	Macademia/grails-app/views/d3/main-viz.gsp
fixed transitions!

but noticed that people don't show up at all
Merge branch 'visualization' of https://github.com/shilad/macademia into interactiveVisualization

Conflicts:
	Macademia/application.properties
	Macademia/grails-app/views/d3/main-viz.gsp
	Macademia/web-app/js/d3test/hub.js
	Macademia/web-app/js/d3test/interest-viz.js
	Macademia/web-app/js/d3test/main-viz.js
	Macademia/web-app/js/d3test/person.js

Attempting to merge with visualization branch
Merge branch 'visualization' of https://github.com/shilad/macademia into interactiveVisualization

Conflicts:
	Macademia/application.properties
	Macademia/grails-app/views/d3/main-viz.gsp
	Macademia/web-app/js/d3test/hub.js
	Macademia/web-app/js/d3test/interest-viz.js
	Macademia/web-app/js/d3test/main-viz.js
	Macademia/web-app/js/d3test/person.js

Attempting to merge with visualization branch
Merge remote-tracking branch 'origin/interactiveVisualization' into interactiveVisualization
Merge pull request #21 from shilad/interactiveVisualization

Interactive visualization
Restoring current versions of main macademia files.