merged files
Merge branch 'master' of https://github.com/vamp774/IceChat