working list of branches (LYKA PAAYUS UI =) )
Merge branch 'master' of https://github.com/PerlaYap/project

Conflicts:
	application/controllers/general.php
view user profile (not yet tested)

kailangan young search makasearch ng users din
needs to be tested
Merge branch 'master' of https://github.com/PerlaYap/project