Signed-off-by: bakasajoshua <baksajoshua09@gmail.com>
Merge branch 'master' of https://github.com/bakasajoshua/CD4

Conflicts:
	application/modules/admin/controllers/reports.php