Added following, follower display.
Merge branch 'RubyTest4'

Conflicts:
	app/views/users/_user.html.erb
	app/views/users/show_follow.html.erb