with bootstrap
Merge branch 'master' of https://github.com/JannWencyTico/rmsproject

Conflicts:
	application/controllers/display.php
	application/views/admin_view_faculty_profile.php
	application/views/dean_view_faculty_profile.php
	application/views/display.php
	application/views/hr_view_faculty_profile.php
	application/views/includes/navi_hr.php
	application/views/rankMember_view_faculty_profile.php
	application/views/search_results.php
	application/views/view_profile.php