bug fixes
messaging done
Merge branch 'master' of https://github.com/jcze91/Chatty.git