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

Conflicts:
	application/config/routes.phpupload
Merge branch 'master' of https://github.com/redlinx/hr_recordsystem