no message
Merge branch 'master' of https://github.com/JannWencyTico/rmsproject

Conflicts:
	application/views/hr_view_faculty_education.php
	application/views/hr_view_faculty_eligibility.php
	application/views/hr_view_faculty_training.php
	application/views/hr_view_faculty_work.php
	application/views/view_education.php
	application/views/view_eligibility.php
	application/views/view_trainings.php
	uploads/224_1_25.jpg