stuff
Merge branch 'master' of https://github.com/guimou123/CommuniT-Client