changed something
Merge branch 'master' of https://github.com/jashonw/montage-chat