Merge branch 'khalil' of github.com:tinfoilhat/tinfoil-sms into khalil
Merge branch 'khalil' of github.com:tinfoilhat/tinfoil-sms into khalil