removed merge conflict in models/messages.js
Merge branch 'dev' of https://github.com/mlfryman/dibster into dev