merge commit
merge commit
Merge branch 'master' of https://github.com/OpenComm/OpenComm-Group
adding users nad logging in work