local commit
Pulling changes
Moved friends page and friending/unfriending functionality to MVC
Pulling search page changes from Dhruv
Fixed merge conflict with friends model
local commit
fixing merge conflicts