Initial commit
this is a new file
initial git initialization
Merge branch 'master', remote branch 'origin/master'

Conflicts:
updated the install script with gcconnex theme
added gcconnex logo file
Merge branch 'devel-bryden' into gcconnex
Updated the install messages to say GCconnex
Hi Christine, here's a new file for yoru branch
Merge branch 'brydens', remote branch 'origin/dev-cyu' into brydens
Removed c_email_extensions as a required dependency
Added a step to install script to activate required moudles with proper priorities
added files required for install script
Merge branch 'testbranch', remote branch 'origin/master' into testbranch

Conflicts:
Merge branch 'testbranch'
Modified ElggInstaller debug code
Merge branch 'bryden' into brydens
Group file to copy
Fixed infinite loop possibility in the Modules section of ElggInstall script.
Added installation message to step 6: modules