maybe?
Merge branch 'updating-users'

Hope
Merge branch 'master' into updating-users

Master done got screwed up :(