testing
freinds class commit  testing
friends added
freinds class commit  testing
Revert "friends added"

This reverts commit 61964ae5d1ae9ce260a10197dd380ed25b7e28a4.
commit :(
check
First time sprint4
Merge branch 'master' of https://github.com/AhsanLatif/facebook into Sprint4

Conflicts:
	application/controllers/profile.php
	application/models/main_model.php
	application/views/header.php
	application/views/profile/index.php
	application/views/profile/loggedInNav.php
	application/views/profile/viewProfile.php
	media/js/mainJava.js
	media/styles.css
	system/database/drivers/mysql/mysql_driver.php