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

Conflicts:
	application/models/addnewmember_model.php
	application/views/branchmanager/forapproval.php