GitHub...why?
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Rebecca's changes test
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
playing around
a direction to go in!
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/d3/darth.gsp
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/d3/darth.gsp
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/d3/interest-layout.gsp
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/d3/interest-layout.gsp
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/d3/interest-layout.gsp
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/d3/interest-layout.gsp
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/application.properties
	Macademia/grails-app/views/d3/interest-layout.gsp
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branches 'consortia' and 'consortia' of https://github.com/shilad/macademia into consortia