Added some functionality for profile
Search Bar Added
controller updated-Search function

incomplete at the moment
Info+Picture Edit
Merge branch 'master' of https://github.com/SR-sharmeen/facebook

Conflicts:
	application/controllers/profile.php
	application/models/main_model.php
	application/views/profile/index.php
	application/views/profile/loggedInNav.php
	media/js/mainJava.js
	media/styles.css
trying to fix