Commiting so i can merge
fixed merge conflicts
Added Ajax for friend, unfriend, and settings
Merge branch 'master' of github.com:pateldhruv/socialnetwork
Added ajax call to pull in account settings data