jewdacadabra
Merge branch 'master' of https://github.com/droid87/SecureChatManager.git
merge fail...