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

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

Conflicts:
	application/modules/admin/controllers/admin.php
Did some corrections. Imebaki page mpya ya ile modal na image mpya ya home page kwa welcome
Midnight craze
Additional stuff
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
staff on working
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
Richard fixed the log in
trial and error
trying to get back code
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop
Moved the modal from home  to a different page
Made a few corrections
IMAGE
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/modules/users/controllers/users.php
	application/modules/users/models/m_user.php

and more changes on the staff part
Modified changes