profile.php
Merge branch 'master' of https://github.com/AhsanLatif/facebook into Sprint4

Conflicts:
	application/controllers/profile.php