Fix for Add info on IRC channel to website #23
Merge pull request #1 from chrismattmann/addirc

Fix for #23
fix merge conflict.
fix merge conflict.