added users and tested
Merge branch 'modeling-users'