testing out a branch merge
Merge branch 'newfix' of github.com:m477h3w1012/CyniChat into newfix