manager
working on merge
Merge branch 'master' of github.com:WhisperSystems/TextSecure-iOS
Merge branch 'master' of github.com:WhisperSystems/TextSecure-iOS
Merge branch 'master' of github.com:WhisperSystems/TextSecure-iOS
syntax error