fixed branch conflict. Updated master with user-microposts
Add user following
Final push