Test commit
getting setup for Mockup
Placeholder for consortia portal
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
consortium name
consortium name
images added
working on the consortium page for ACM
Merge remote-tracking branch 'origin/consortia' into consortia

Conflicts:
	Macademia/grails-app/views/home/consortia.gsp
Sam and mine merged
changed paddings
working on the consortium page for ACM
added buttons
sam and margaret merege
for sam
working on the consortium page for ACM
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
search bar
working on the consortium page for ACM
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/home/consortia.gsp