Add functionality of followers and following
  - Still need to fix button to unfollow
  - User pages now display all of their followers and who they are
    following
working on inviting facebook friends
Fix merge conflicts

Merge branch 'Onaracs-feature/facebook_friends'
Fixed merge conflict in schema.rb

Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb