messaging system
Merge branch 'master' of github.com:adnanh/qa