conflicts
no message

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
Increased height of carousel as requested
css inakata
Homepage integrated into the system
Application form is complete and validated

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
Changes kibao
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/WillyMareka/southern_cross into develop
mere changes
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
asdfghjkl;