Uploading Temp
Merge branch 'master' of https://github.com/redlinx/hr_recordsystem

Conflicts:
	application/config/routes.php
	application/controllers/home.php
	application/controllers/layouts.php
	application/models/registration_model.php