From willy
Conflicts:
Some admin changes
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
some changes
Merge branch 'master' of https://github.com/karsanrichard/southern_cross into develop
Administrator
redirect
NTHING
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop

Conflicts:
	application/modules/home/controllers/home.php
More of linking and a liitle bit of table arranging
Some few changes I was told to do
After nikae chini na buda. Kuna more changes nilimake na nacome na work. Kabla tuweke producteev
After pushing
I dont know what /i did
Done something on the about page
Done more on the about page
I have no idea why this commit is here
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/modules/announcements/views/announcement.php
Merge branch 'develop' of https://github.com/bakasajoshua/southern_cross into develop

Conflicts:
	.htaccess
	application/config/autoload.php
	application/config/config.php
	application/modules/admin/controllers/admin.php