Merge branch 'matt2'
Merge branch 'master' of https://github.com/zoeames/VIchan
merge fixed
pull down
body saving
stable
Merge branch 'master' of https://github.com/zoeames/VIchan
merge conflict resolved
pulling master
merge
working
pulling master
merge conflict resolved
stuff
users added to messaging
Merge branch 'master' of https://github.com/zoeames/VIchan