merge succesful
start of compairsonSurvey
setting up the survey!!! we so excited
for sam
pullin
sortables
sliders
sortables
Merge branch 'macSurvey' of https://github.com/shilad/macademia into macSurvey

Conflicts:
	Macademia/grails-app/views/d3/comparisonSurvey.gsp
please work
Merge branch 'macSurvey' of https://github.com/shilad/macademia into macSurvey

Conflicts:
	Macademia/grails-app/views/d3/comparisonSurvey.gsp
successful merge between Margaret's jquerys sliders and Sam's sortables
right colom succesful
pulling
Merge branch 'macSurvey' of https://github.com/shilad/macademia into macSurvey

Conflicts:
	Macademia/grails-app/views/d3/comparisonSurvey.gsp
start to Thursday.
Merge remote-tracking branch 'origin/macSurvey' into macSurvey
Merge branch 'macSurvey' of https://github.com/shilad/macademia into macSurvey

Conflicts:
	Macademia/grails-app/views/d3/comparisonSurvey.gsp
start to Thursday.
start to Thursday.