checking
Merge branch 'master' of https://github.com/AhsanLatif/facebook into abc

Conflicts:
	application/controllers/profile.php
	application/views/profile/viewProfile.php
correction of view people
should be user id not id
none
Merge branch 'master' of https://github.com/AhsanLatif/facebook into abc

Conflicts:
	application/views/profile/index.php
	application/views/profile/viewProfile.php