Update README.md
Merge branch 'users'
Merge branches 'users' and 'master' into users