use diff instead of md5
Merge branch 'master' of github.com:boourns/intercom