Update to include colloquy
Merge pull request #1 from beardedprojamz/master

Adding colloquy