followers and following viewing sent
Merge branch 'master' into tyler-working

Conflicts:
	config/routes.rb