with center no
ignore
ignore
Merge branch 'master' of https://github.com/PerlaYap/project

Conflicts:
	application/views/branchmanager/forapproval.php
	application/views/navigation.php
ignore
Merge branch 'master' of https://github.com/PerlaYap/project

Conflicts:
	application/controllers/salveofficer.php