Merge branch 'updating-users'
Merge branch 'master' of https://github.com/Hustada/sample_app1
changes