hashtags added to chat
Merge branch 'master' of github.com:FrenchBully/chatchat