adding notifications of new messages
fixed merge
Merge branch 'develop' of https://github.com/jeffreybaird/clink into develop