Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
redirecting
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop

Conflicts:
	application/config/autoload.php
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/modules/home/controllers/home.php
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop

Conflicts:
	application/modules/admin/controllers/admin.php
	application/modules/home/controllers/home.php
some changes
Changed a bit of about page
Merge branch 'develop' of https://github.com/johnotaalo/southern_cross-1 into develop
Done something but not finished on courses.
Nimeenda Sadili
Did the services and courses page
conflicts with changes to admin kiasi
Worked on few modifications on course details page
Merge branch 'develop' of https://github.com/bakasajoshua/southern_cross into develop

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/modules/admin/controllers/admin.php
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop