Users can follow other users
Merge branch 'master' into yash