Done up to 11.3
Add user following
Merge branch 'following-users'

Conflicts:
	app/views/microposts/_micropost.html.erb