merge add
Merge branch 'master' of https://github.com/jbaritz/chatitude